Merge branches 'pm-core' and 'pm-domains'