Tracing + comment (issue 6496)