u/fjammes/dm-1446

Reviewing DM-1446