Merge pull request #18713 from eileenmcnaughton/531