Merge pull request #10342 from muphil/patch-1