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