Merge "config.xml: Add config flag for filtering DBS scans" into pi-dev