Merge pull request #16131 from 1715173329/dnslookup