Merge pull request #9989 from annando/issue-9912