Merge pull request #14721 from kirk-circle/master