Merge pull request #23821 from friendly-bits/add_geoip-shell