Merge pull request #15165 from fkohrt/master