Merge pull request #20368 from eileenmcnaughton/cc