v396 branch Changes

v396_preview2 to v396_base (2020-03-23 to 2020-03-30) v396