Merge branch 'devel-pmu' into devel