u/fjammes/dm-1338

Reviewing DM-1338
Ok, DM-1452 created.