Merge pull request #9658 from champtar/master