Merge pull request #15359 from fkohrt/master