Sync dmd with upstream