Merge "Coroutine tracing improvements" into main