v417 review2 Changes

v417_preview to v417_preview2 (2021-06-21 to 2021-06-28) v417