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