Merge branch 'tracing/hw-branch-tracing' into tracing/core