Merge branch 'ao/p4-has-branch-prefix-fix' into maint