Merge pull request #13848 from dibdot/banip