Merge pull request #15276 from dibdot/banip