Merge "Use the right traceEnd method"