v367 branch Changes

v367_preview2 to v367_base (2018-06-11 to 2018-06-18) v367