Merge "Fix use of get_server_ip with fixed networks"