Merge pull request #9452 from annando/issue-9451