Merge "Merge console_output_client to server_client"