Merge "fix the confused issue in server_client about list_server"