v370 branch Changes

v370_preview2 to v370_base (2018-08-13 to 2018-08-20) v370