Merge "Merge "Add more tracing" into sc-v2-dev am: 17456caf69 am: 98d1aae6e0"