Merge "Remove CDM check for VDM service" into main