Merge branch 'perfcounters/tracing' into perfcounters/core