Merge back earlier PM core material for v5.1.