Merge pull request #2697 from WalterBright/sync-with-dmc

sync backend files with dmc