Merge "Eliminate lambdas from tracing helper macro" into main