Merge pull request #14258 from TimoWilken/patch-1