Merge "Add more tracing" into sc-v2-dev