Merge pull request #11798 from GuLinux/patch-1