Merge "Small improvment in VDM stored CDM associations." into main