Merge branch 'pnp-fix' into release-2.6.27