Merge pull request #20921 from eileenmcnaughton/cleanup3