Merge pull request #15844 from dibdot/adblock