ref #7086, #7095 Adapt to cdm model changes