Merge branch 'pw/p4-submit-conflicts'