u/danielw/dm-1395

Creating PR for reviewing DM-1395
hmm, it seems to build fine, so let's try it for now.