Merge pull request #20204 from eileenmcnaughton/freeze