u/fjammes/DM-1538

Reviewing DM-1538