Rebase for latest vendor_pa