Merge pull request #22619 from stangri/master-adblock-fast