Merge pull request #9174 from annando/issue-9167