v366 branch Changes

v366_preview2 to v366_base (2018-05-21 to 2018-05-29) v366