v347 branch Changes

v347_preview2 to v347_base (2017-03-27 to 2017-04-03) v347