Merge "Several changes to VDM/CDM logic." into main