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