Merge "Add exception handling for api side with trace log and With internal error...