Merge pull request #7071 from dibdot/banIP