Merge pull request #19593 from eileenmcnaughton/535