Merge "vc tracing: make deterministic" into main