Merge pull request #23198 from eileenmcnaughton/549