Merge pull request #9364 from annando/issue-9363