v335 branch Changes

v335_preview2 to v335_base (2016-06-27 to 2016-07-04) v335