Merge back earlier 'pm-domains' material for v4.5.