Merge back earlier 'pm-tools' material for v3.20