Merge branch 'jh/trace2-timers-and-counters'