Merge pull request #11797 from hoegrammer/master