For review comments for DM-1468
Merge branch 'u/pgee/DM-1468'
Merge branch 'master' into u/pgee/DM-1463