v417 review Changes

v416_base to v417_preview (2021-06-14 to 2021-06-21) v417