Merge pull request #12567 from Grommish/master