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