Merge branch 'pw/p4-branch-fixes' into next