Merge branch 'pm-x86'