Merge pull request #12303 from hammer-is/master