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