Merge pull request #2681 from elfiesmelfie/feat_pmu_cores