Merge branch 'pm-fixes' into fixes