Merge pull request #9788 from dibdot/adblock