Merge pull request #9367 from annando/issue-9366