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