Merge remote-tracking branch 'origin/cdm-4.7' into feature/cdm-4.7