Merge "Fix tracing"