Merge pull request #10031 from Mimoja/patch-1