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