u/fjammes/dm-1497

PR for review.