v318 review2 Changes

v318_preview to v318_preview2 (2015-06-08 to 2015-06-15) v318