Merge "Add server param in manager.get_remote_client"