Merge branch 'va/p4-client-path'