Merge pull request #18264 from luqunl/18192