Merge pull request #10160 from annando/issue-10156