Merge branch 'pm-fixes'