Merge pull request #9014 from annando/issue-9013