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