Merge branch 'perfcounters/urgent' into perfcounters/core