Merge branch 'pw/p4-docs-and-tests'