Merge pull request #8862 from annando/issue-8860