Merge pull request #17557 from ngo360/master