Merge branch 'pnp' into release