Merge tag 'tai-for-tracing' into timers/core