Merge pull request #14779 from dibdot/banip