Merge pull request #11578 from rpunkfu/patch-2