Merge "Fix tracing."