DM-1010

Here's a GitHub PR to help with the review of DM-1010.