v396 review2 Changes

v396_preview to v396_preview2 (2020-03-16 to 2020-03-23) v396