Merge back PM core changes for v5.17.