v368 branch Changes

v368_preview2 to v368_base (2018-07-02 to 2018-07-09) v368