Merge branches 'pnp' and 'pm-tools'