Merge pull request #9518 from Asizon/cmsImprovements