Merge "Updates to coroutine tracing" into main