v418 review Changes

v417_base to v418_preview (2021-07-05 to 2021-07-12) v418