Merge pull request #18472 from sotux/master