Merge branch 'pnp-debug' into test