v369 branch Changes

v369_preview2 to v369_base (2018-07-23 to 2018-07-30) v369