Merge pull request #15289 from dibdot/banip