merge with dmc updates

Should not be any substantive changes for dmd.