Merge branch 'develop' into feature/cdm-4.7