Merge "Fixed wrong traceEnd() call"