Merge branch 'pxerom-pmm'