Merge "Fix Geo Config"