u/fjammes/dm-1338

Reviewing DM-1338
No problem, it's up to you.