v417 branch Changes

v417_preview2 to v417_base (2021-06-28 to 2021-07-05) v417