Merge pull request #8853 from annando/issue-8836