Merge "Use the root case to set remote stack trace for"