Merge pull request #9669 from bzc6p/master