Merge pull request #9197 from seamuslee001/4.7.12-rc