Merge branches 'pm-em' and 'pm-core'