Merge "Revert "Removing unused tracing"" into sc-v2-dev