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