Merge pull request #9270 from annando/issue-9264