Changes for final code review of DM-1466
Merge branch 'u/pgee/DM-1466a' into u/pgee/DM-1467a