Merge pull request #9460 from annando/issue-9457