Merge pull request #2374 from maryamtahhan/feat_intel_pmu_bugfixes