Merge pull request #8173 from eileenmcnaughton/master