Merge branch 'pm-core'