Merge pull request #9981 from annando/issue-9977