Merge pull request #9499 from eileenmcnaughton/4.7.14-rc