Merge branch 'pw/p4-use-client-spec-branch-detection'