Merge branch 'pm-tools' into pm-cpu