Merge pull request #23991 from friendly-bits/master-geoip-shell