Merge DM changes