working copy of both the options of dns server, and proxy
Merge remote-tracking branch 'origin'