dns: merge branch 'th/dns-resolv-conf-file-bgo764004'