v349 branch Changes

v349_preview2 to v349_base (2017-05-08 to 2017-05-15) v349