Merge pull request #11210 from FooBarQuaxx/patch-2