Merge pull request #9684 from eglooca/master