merge changes from Net-DNS-Dynamic-Adfilter