Add new legacy branches for build and vendor_pa