v399 branch Changes

v399_preview2 to v399_base (2020-05-25 to 2020-06-01) v399