merge changes from App-DNS-Adblock