DCOM-194

Cleaned up version of #278