Merge "safe_setup preserve original trace"