Merge pull request #11373 from ledvinap/patch-1