v397 review2 Changes

v397_preview to v397_preview2 (2020-04-06 to 2020-04-13) v397