Merge back earlier PM core material for v4.16.