Merge pull request #16248 from eileenmcnaughton/cc