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