v318 review Changes

v317_base to v318_preview (2015-06-01 to 2015-06-08) v318