v334 branch Changes

v334_preview2 to v334_base (2016-06-06 to 2016-06-13) v334