v348 branch Changes

v348_preview2 to v348_base (2017-04-17 to 2017-04-24) v348