Merge pull request #9739 from champtar/master