Merge pull request #9295 from annando/issue-9281