Merge "Handle file_recv option"