Merge pull request #13723 from eileenmcnaughton/5.11