Merge back PM core material for v4.18.