Changes for final code review of DM-1466