merge with dmc updates
Merge pull request #2599 from WalterBright/merge-with-dmc

merge with dmc updates