Merge back earlier PM tools material for v4.18.