v338 branch Changes

v338_preview2 to v338_base (2016-08-29 to 2016-09-06) v338