Merge pull request #19796 from stangri/master-simple-adblock