v396 review Changes

v395_base to v396_preview (2020-03-09 to 2020-03-16) v396