v397 review Changes

v396_base to v397_preview (2020-03-30 to 2020-04-06) v397