Merge "Make remote_client reno readable"