Merge pull request #16776 from stangri/master-https-dns-proxy