Merge branch 'pnp-log' into release