Merge pull request #10014 from bishko/patch-1