Tickets/dm 1430

CHeck out the DM-1430 comment on Jira for review preliminaries.