Merge pull request #15273 from eileenmcnaughton/518