diff --git a/calico-vpp-agent/cmd/calico_vpp_dataplane.go b/calico-vpp-agent/cmd/calico_vpp_dataplane.go
index 150aa370..ce322d7c 100644
--- a/calico-vpp-agent/cmd/calico_vpp_dataplane.go
+++ b/calico-vpp-agent/cmd/calico_vpp_dataplane.go
@@ -55,13 +55,15 @@ var (
 	log *logrus.Logger
 )
 
-func Go(f func(t *tomb.Tomb) error) {
+func Go(f func(t *tomb.Tomb) error, name string) {
 	if t.Alive() {
+		log.Infof("STARTING %s", name)
 		t.Go(func() error {
 			err := f(&t)
 			if err != nil {
 				log.Warnf("Tomb function errored with %s", err)
 			}
+			log.Infof("STOPPED %s", name)
 			return err
 		})
 	}
@@ -160,7 +162,7 @@ func main() {
 	serviceServer.SetBGPConf(bgpConf)
 
 	watchDog := watchdog.NewWatchDog(log.WithFields(logrus.Fields{"component": "watchDog"}), &t)
-	Go(policyServer.ServePolicy)
+	Go(policyServer.ServePolicy, "policyServer.ServePolicy")
 	felixConfig := watchDog.Wait(policyServer.FelixConfigChan, "Waiting for FelixConfig to be provided by the calico pod")
 	ourBGPSpec := watchDog.Wait(policyServer.GotOurNodeBGPchan, "Waiting for bgp spec to be provided on node add")
 	if ourBGPSpec != nil {
@@ -173,7 +175,7 @@ func main() {
 	}
 
 	if *config.GetCalicoVppFeatureGates().MultinetEnabled {
-		Go(netWatcher.WatchNetworks)
+		Go(netWatcher.WatchNetworks, "netWatcher.WatchNetworks")
 		watchDog.Wait(netWatcher.InSync, "Waiting for networks to be listed and synced")
 	}
 
@@ -182,20 +184,20 @@ func main() {
 		connectivityServer.SetFelixConfig(felixConfig.(*felixconfig.Config))
 	}
 
-	Go(routeWatcher.WatchRoutes)
-	Go(linkWatcher.WatchLinks)
-	Go(bgpConfigurationWatcher.WatchBGPConfiguration)
-	Go(prefixWatcher.WatchPrefix)
-	Go(peerWatcher.WatchBGPPeers)
-	Go(connectivityServer.ServeConnectivity)
-	Go(routingServer.ServeRouting)
-	Go(serviceServer.ServeService)
-	Go(cniServer.ServeCNI)
-	Go(prometheusServer.ServePrometheus)
+	Go(routeWatcher.WatchRoutes, "routeWatcher.WatchRoutes")
+	Go(linkWatcher.WatchLinks, "linkWatcher.WatchLinks")
+	Go(bgpConfigurationWatcher.WatchBGPConfiguration, "bgpConfigurationWatcher.WatchBGPConfiguration")
+	Go(prefixWatcher.WatchPrefix, "prefixWatcher.WatchPrefix")
+	Go(peerWatcher.WatchBGPPeers, "peerWatcher.WatchBGPPeers")
+	Go(connectivityServer.ServeConnectivity, "connectivityServer.ServeConnectivity")
+	Go(routingServer.ServeRouting, "routingServer.ServeRouting")
+	Go(serviceServer.ServeService, "serviceServer.ServeService")
+	Go(cniServer.ServeCNI, "cniServer.ServeCNI")
+	Go(prometheusServer.ServePrometheus, "prometheusServer.ServePrometheus")
 
 	// watch LocalSID if SRv6 is enabled
 	if *config.GetCalicoVppFeatureGates().SRv6Enabled {
-		Go(localSIDWatcher.WatchLocalSID)
+		Go(localSIDWatcher.WatchLocalSID, "localSIDWatcher.WatchLocalSID")
 	}
 
 	log.Infof("Agent started")
diff --git a/calico-vpp-agent/cni/cni_pod_test.go b/calico-vpp-agent/cni/cni_pod_test.go
index 11bbc729..3f8ac1bc 100644
--- a/calico-vpp-agent/cni/cni_pod_test.go
+++ b/calico-vpp-agent/cni/cni_pod_test.go
@@ -231,7 +231,7 @@ var _ = Describe("Pod-related functionality of CNI", func() {
 					socket, err := vpp.MemifsocketByID(memifs[0].SocketId)
 					Expect(err).ToNot(HaveOccurred(), "failed to get memif socket")
 					Expect(socket.SocketFilename).To(Equal(
-						fmt.Sprintf("@netns:%s@vpp/memif-%s", newPod.Netns, newPod.InterfaceName)),
+						fmt.Sprintf("abstract:%s,netns_name=%s", newPod.InterfaceName, newPod.Netns)),
 						"memif socket file is not configured correctly")
 
 					By("Checking PBL (packet punting) to redirect some traffic into memif (secondary interface)")
diff --git a/calico-vpp-agent/cni/cni_server.go b/calico-vpp-agent/cni/cni_server.go
index 435194bd..f17dbbea 100644
--- a/calico-vpp-agent/cni/cni_server.go
+++ b/calico-vpp-agent/cni/cni_server.go
@@ -373,7 +373,8 @@ func (s *Server) cniServerEventLoop(t *tomb.Tomb) error {
 	for {
 		select {
 		case <-t.Dying():
-			break
+			s.log.Warnf("CNI server asked to stop")
+			return nil
 		case evt := <-s.cniEventChan:
 			switch evt.Type {
 			case common.FelixConfChanged:
@@ -482,12 +483,14 @@ func (s *Server) ServeCNI(t *tomb.Tomb) error {
 	}
 
 	s.log.Infof("CNI Server returned")
+	s.grpcServer.Stop()
+	s.log.Infof("GRPC stopped")
 
-	s.grpcServer.GracefulStop()
 	err = syscall.Unlink(config.CNIServerSocket)
 	if err != nil {
 		return err
 	}
+	s.log.Infof("Socket CNI unlink")
 
 	return nil
 }
diff --git a/calico-vpp-agent/cni/pod_interface/common.go b/calico-vpp-agent/cni/pod_interface/common.go
index c6734052..6880a2d1 100644
--- a/calico-vpp-agent/cni/pod_interface/common.go
+++ b/calico-vpp-agent/cni/pod_interface/common.go
@@ -37,6 +37,8 @@ func (i *PodInterfaceDriverData) SpreadTxQueuesOnWorkers(swIfIndex uint32, numTx
 		"swIfIndex": swIfIndex,
 	}).Debugf("Spreading %d TX queues on %d workers for pod interface: %v", numTxQueues, i.NDataThreads, i.Name)
 
+	return nil // FIXME
+
 	// set first tx queue for main worker
 	err = i.vpp.SetInterfaceTxPlacement(swIfIndex, 0 /* queue */, 0 /* worker */)
 	if err != nil {
diff --git a/calico-vpp-agent/cni/pod_interface/memif.go b/calico-vpp-agent/cni/pod_interface/memif.go
index ad0875c3..4d2467be 100644
--- a/calico-vpp-agent/cni/pod_interface/memif.go
+++ b/calico-vpp-agent/cni/pod_interface/memif.go
@@ -58,7 +58,7 @@ func (i *MemifPodInterfaceDriver) CreateInterface(podSpec *storage.LocalPodSpec,
 	if podSpec.NetworkName == "" {
 		memifName = "@vpp/memif-" + podSpec.InterfaceName
 	}
-	socketId, err := i.vpp.AddMemifSocketFileName(fmt.Sprintf("@netns:%s%s", podSpec.NetnsName, memifName))
+	socketId, err := i.vpp.AddMemifSocketFileName(fmt.Sprintf("abstract:%s,netns_name=%s", memifName, podSpec.NetnsName))
 	if err != nil {
 		return err
 	} else {
diff --git a/vpplink/cnat.go b/vpplink/cnat.go
index 772f7252..c0796eab 100644
--- a/vpplink/cnat.go
+++ b/vpplink/cnat.go
@@ -18,6 +18,7 @@ package vpplink
 import (
 	"fmt"
 	"net"
+	"github.com/pkg/errors"
 
 	"github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/cnat"
 	"github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types"
@@ -25,9 +26,11 @@ import (
 )
 
 const (
-	FeatureArcCnatInput  = "ip?-unicast cnat-input-ip?"
-	FeatureArcCnatOutput = "ip?-output cnat-output-ip?"
-	FeatureArcSnat       = "ip?-unicast cnat-snat-ip?"
+	FeatureArcCnatLookup    = "ip?-unicast cnat-lookup-ip?"
+	FeatureArcCnatInput     = "ip?-unicast cnat-input-ip?"
+	FeatureArcCnatOutput    = "ip?-output cnat-output-ip?"
+	FeatureArcCnatWriteBack = "ip?-output cnat-writeback-ip?"
+	FeatureArcSnat          = "ip?-unicast cnat-snat-ip?"
 )
 
 const InvalidID = ^uint32(0)
@@ -124,6 +127,14 @@ func (v *VppLink) CnatDelSnatPrefix(prefix *net.IPNet) error {
 }
 
 func (v *VppLink) CnatEnableFeatures(swIfIndex uint32) (err error) {
+	err = v.EnableFeatureArc46(swIfIndex, FeatureArcCnatLookup)
+	if err != nil {
+		return errors.Wrap(err, "Error enabling arc dnat in")
+	}
+	err = v.EnableFeatureArc46(swIfIndex, FeatureArcCnatWriteBack)
+	if err != nil {
+		return errors.Wrap(err, "Error enabling arc dnat out")
+	}
 	err = v.EnableFeatureArc46(swIfIndex, FeatureArcCnatInput)
 	if err != nil {
 		return fmt.Errorf("enabling arc dnat input failed: %w", err)
diff --git a/vpplink/generated/bindings/capo/capo.ba.go b/vpplink/generated/bindings/capo/capo.ba.go
index 883dc138..4c7b780c 100644
--- a/vpplink/generated/bindings/capo/capo.ba.go
+++ b/vpplink/generated/bindings/capo/capo.ba.go
@@ -332,7 +332,6 @@ func (u *CapoIpsetMemberValUnion) GetTuple() (a CapoThreeTuple) {
 	return
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoConfigurePolicies defines message 'capo_configure_policies'.
 // InProgress: the message form may change in the future versions
 type CapoConfigurePolicies struct {
@@ -576,10 +575,6 @@ func (m *CapoGetVersionReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Control ping from the client to the server response
-//   - retval - return code for the request
-//   - vpe_pid - the pid of the vpe, returned by the server
-//
 // CapoIpsetAddDelMembers defines message 'capo_ipset_add_del_members'.
 // InProgress: the message form may change in the future versions
 type CapoIpsetAddDelMembers struct {
@@ -678,10 +673,6 @@ func (m *CapoIpsetAddDelMembersReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Control ping from the client to the server response
-//   - retval - return code for the request
-//   - vpe_pid - the pid of the vpe, returned by the server
-//
 // CapoIpsetCreate defines message 'capo_ipset_create'.
 // InProgress: the message form may change in the future versions
 type CapoIpsetCreate struct {
@@ -716,10 +707,6 @@ func (m *CapoIpsetCreate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Control ping from the client to the server response
-//   - retval - return code for the request
-//   - vpe_pid - the pid of the vpe, returned by the server
-//
 // CapoIpsetCreateReply defines message 'capo_ipset_create_reply'.
 // InProgress: the message form may change in the future versions
 type CapoIpsetCreateReply struct {
@@ -758,10 +745,6 @@ func (m *CapoIpsetCreateReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Control ping from the client to the server response
-//   - retval - return code for the request
-//   - vpe_pid - the pid of the vpe, returned by the server
-//
 // CapoIpsetDelete defines message 'capo_ipset_delete'.
 // InProgress: the message form may change in the future versions
 type CapoIpsetDelete struct {
@@ -830,7 +813,6 @@ func (m *CapoIpsetDeleteReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoPolicyCreate defines message 'capo_policy_create'.
 // InProgress: the message form may change in the future versions
 type CapoPolicyCreate struct {
@@ -888,7 +870,6 @@ func (m *CapoPolicyCreate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoPolicyCreateReply defines message 'capo_policy_create_reply'.
 // InProgress: the message form may change in the future versions
 type CapoPolicyCreateReply struct {
@@ -927,7 +908,6 @@ func (m *CapoPolicyCreateReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoPolicyDelete defines message 'capo_policy_delete'.
 // InProgress: the message form may change in the future versions
 type CapoPolicyDelete struct {
@@ -996,7 +976,6 @@ func (m *CapoPolicyDeleteReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoPolicyUpdate defines message 'capo_policy_update'.
 // InProgress: the message form may change in the future versions
 type CapoPolicyUpdate struct {
@@ -1176,7 +1155,6 @@ func (m *CapoRuleCreate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoRuleCreateReply defines message 'capo_rule_create_reply'.
 // InProgress: the message form may change in the future versions
 type CapoRuleCreateReply struct {
@@ -1215,7 +1193,6 @@ func (m *CapoRuleCreateReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoRuleDelete defines message 'capo_rule_delete'.
 // InProgress: the message form may change in the future versions
 type CapoRuleDelete struct {
@@ -1284,7 +1261,6 @@ func (m *CapoRuleDeleteReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// // where the packet only needs to match one entry in either category
 // CapoRuleUpdate defines message 'capo_rule_update'.
 // InProgress: the message form may change in the future versions
 type CapoRuleUpdate struct {
diff --git a/vpplink/generated/bindings/cnat/cnat.ba.go b/vpplink/generated/bindings/cnat/cnat.ba.go
index 400ccb75..f9b2c945 100644
--- a/vpplink/generated/bindings/cnat/cnat.ba.go
+++ b/vpplink/generated/bindings/cnat/cnat.ba.go
@@ -240,10 +240,6 @@ type CnatTranslation struct {
 	Paths    []CnatEndpointTuple `binapi:"cnat_endpoint_tuple[n_paths],name=paths" json:"paths,omitempty"`
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatGetSnatAddresses defines message 'cnat_get_snat_addresses'.
 // InProgress: the message form may change in the future versions
 type CnatGetSnatAddresses struct{}
@@ -272,10 +268,6 @@ func (m *CnatGetSnatAddresses) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatGetSnatAddressesReply defines message 'cnat_get_snat_addresses_reply'.
 // InProgress: the message form may change in the future versions
 type CnatGetSnatAddressesReply struct {
@@ -326,10 +318,6 @@ func (m *CnatGetSnatAddressesReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatSessionDetails defines message 'cnat_session_details'.
 // InProgress: the message form may change in the future versions
 type CnatSessionDetails struct {
@@ -415,10 +403,6 @@ func (m *CnatSessionDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatSessionDump defines message 'cnat_session_dump'.
 // InProgress: the message form may change in the future versions
 type CnatSessionDump struct{}
@@ -447,10 +431,6 @@ func (m *CnatSessionDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatSessionPurge defines message 'cnat_session_purge'.
 // InProgress: the message form may change in the future versions
 type CnatSessionPurge struct{}
@@ -513,10 +493,6 @@ func (m *CnatSessionPurgeReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatSetSnatAddresses defines message 'cnat_set_snat_addresses'.
 // InProgress: the message form may change in the future versions
 type CnatSetSnatAddresses struct {
@@ -662,10 +638,6 @@ func (m *CnatSetSnatPolicyReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatSnatPolicyAddDelExcludePfx defines message 'cnat_snat_policy_add_del_exclude_pfx'.
 // InProgress: the message form may change in the future versions
 type CnatSnatPolicyAddDelExcludePfx struct {
@@ -748,10 +720,6 @@ func (m *CnatSnatPolicyAddDelExcludePfxReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatSnatPolicyAddDelIf defines message 'cnat_snat_policy_add_del_if'.
 // InProgress: the message form may change in the future versions
 type CnatSnatPolicyAddDelIf struct {
@@ -830,10 +798,6 @@ func (m *CnatSnatPolicyAddDelIfReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatTranslationDel defines message 'cnat_translation_del'.
 // InProgress: the message form may change in the future versions
 type CnatTranslationDel struct {
@@ -902,10 +866,6 @@ func (m *CnatTranslationDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatTranslationDetails defines message 'cnat_translation_details'.
 // InProgress: the message form may change in the future versions
 type CnatTranslationDetails struct {
@@ -1019,10 +979,6 @@ func (m *CnatTranslationDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatTranslationDump defines message 'cnat_translation_dump'.
 // InProgress: the message form may change in the future versions
 type CnatTranslationDump struct{}
@@ -1168,10 +1124,6 @@ func (m *CnatTranslationUpdate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* An enpoint is either
-//   - An IP & a port
-//   - An interface, an address familiy and a port
-//
 // CnatTranslationUpdateReply defines message 'cnat_translation_update_reply'.
 // InProgress: the message form may change in the future versions
 type CnatTranslationUpdateReply struct {
diff --git a/vpplink/generated/bindings/ikev2/ikev2.ba.go b/vpplink/generated/bindings/ikev2/ikev2.ba.go
index 3aff9b88..fdea70d3 100644
--- a/vpplink/generated/bindings/ikev2/ikev2.ba.go
+++ b/vpplink/generated/bindings/ikev2/ikev2.ba.go
@@ -2082,10 +2082,6 @@ func (m *Ikev2SetResponder) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IKEv2: Set IKEv2 responder interface and IP address
-//   - name - IKEv2 profile name
-//   - responder - responder data
-//
 // Ikev2SetResponderHostname defines message 'ikev2_set_responder_hostname'.
 // InProgress: the message form may change in the future versions
 type Ikev2SetResponderHostname struct {
diff --git a/vpplink/generated/bindings/interface/interface.ba.go b/vpplink/generated/bindings/interface/interface.ba.go
index 358a7392..f586f104 100644
--- a/vpplink/generated/bindings/interface/interface.ba.go
+++ b/vpplink/generated/bindings/interface/interface.ba.go
@@ -3,7 +3,7 @@
 // Package interfaces contains generated bindings for API file interface.api.
 //
 // Contents:
-// - 68 messages
+// - 72 messages
 package interfaces
 
 import (
@@ -23,7 +23,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "interface"
 	APIVersion = "3.2.3"
-	VersionCrc = 0xddff3487
+	VersionCrc = 0xd99dbd4
 )
 
 // Enable or disable detailed interface stats
@@ -269,7 +269,6 @@ func (m *CreateLoopbackReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* Gross kludge, DGMS
 // CreateSubif defines message 'create_subif'.
 type CreateSubif struct {
 	SwIfIndex   interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -319,7 +318,6 @@ func (m *CreateSubif) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /* Gross kludge, DGMS
 // CreateSubifReply defines message 'create_subif_reply'.
 type CreateSubifReply struct {
 	Retval    int32                          `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -613,9 +611,6 @@ func (m *GetBuffersStats) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Get available, cached and used buffers
-//   - buffer_index - buffer stat index
-//
 // GetBuffersStatsReply defines message 'get_buffers_stats_reply'.
 type GetBuffersStatsReply struct {
 	Retval           int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -806,6 +801,186 @@ func (m *InterfaceNameRenumberReply) Unmarshal(b []byte) error {
 	return nil
 }
 
+// PcapTraceOff defines message 'pcap_trace_off'.
+type PcapTraceOff struct{}
+
+func (m *PcapTraceOff) Reset()               { *m = PcapTraceOff{} }
+func (*PcapTraceOff) GetMessageName() string { return "pcap_trace_off" }
+func (*PcapTraceOff) GetCrcString() string   { return "51077d14" }
+func (*PcapTraceOff) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *PcapTraceOff) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	return size
+}
+func (m *PcapTraceOff) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	return buf.Bytes(), nil
+}
+func (m *PcapTraceOff) Unmarshal(b []byte) error {
+	return nil
+}
+
+// PcapTraceOffReply defines message 'pcap_trace_off_reply'.
+type PcapTraceOffReply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *PcapTraceOffReply) Reset()               { *m = PcapTraceOffReply{} }
+func (*PcapTraceOffReply) GetMessageName() string { return "pcap_trace_off_reply" }
+func (*PcapTraceOffReply) GetCrcString() string   { return "e8d4e804" }
+func (*PcapTraceOffReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *PcapTraceOffReply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *PcapTraceOffReply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *PcapTraceOffReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
+// pcap_trace_on
+//   - capture_rx - capture received packets
+//   - capture_tx - capture transmitted packets
+//   - capture_drop - capture dropped packets
+//   - filter - is a filter is being used on this capture
+//   - preallocate_data - preallocate the data buffer
+//   - free_data - free the data buffer
+//   - max_packets - depth of local buffer
+//   - max_bytes_per_packet - maximum number of bytes to capture
+//     for each packet
+//   - sw_if_index - specify a given interface, or 0 for any
+//   - error - filter packets based on a specific error.
+//   - filename - output filename, will be placed in /tmp
+//
+// PcapTraceOn defines message 'pcap_trace_on'.
+type PcapTraceOn struct {
+	CaptureRx         bool                           `binapi:"bool,name=capture_rx" json:"capture_rx,omitempty"`
+	CaptureTx         bool                           `binapi:"bool,name=capture_tx" json:"capture_tx,omitempty"`
+	CaptureDrop       bool                           `binapi:"bool,name=capture_drop" json:"capture_drop,omitempty"`
+	Filter            bool                           `binapi:"bool,name=filter" json:"filter,omitempty"`
+	PreallocateData   bool                           `binapi:"bool,name=preallocate_data" json:"preallocate_data,omitempty"`
+	FreeData          bool                           `binapi:"bool,name=free_data" json:"free_data,omitempty"`
+	MaxPackets        uint32                         `binapi:"u32,name=max_packets,default=1000" json:"max_packets,omitempty"`
+	MaxBytesPerPacket uint32                         `binapi:"u32,name=max_bytes_per_packet,default=512" json:"max_bytes_per_packet,omitempty"`
+	SwIfIndex         interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
+	Error             string                         `binapi:"string[128],name=error" json:"error,omitempty"`
+	Filename          string                         `binapi:"string[64],name=filename" json:"filename,omitempty"`
+}
+
+func (m *PcapTraceOn) Reset()               { *m = PcapTraceOn{} }
+func (*PcapTraceOn) GetMessageName() string { return "pcap_trace_on" }
+func (*PcapTraceOn) GetCrcString() string   { return "cb39e968" }
+func (*PcapTraceOn) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *PcapTraceOn) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 1   // m.CaptureRx
+	size += 1   // m.CaptureTx
+	size += 1   // m.CaptureDrop
+	size += 1   // m.Filter
+	size += 1   // m.PreallocateData
+	size += 1   // m.FreeData
+	size += 4   // m.MaxPackets
+	size += 4   // m.MaxBytesPerPacket
+	size += 4   // m.SwIfIndex
+	size += 128 // m.Error
+	size += 64  // m.Filename
+	return size
+}
+func (m *PcapTraceOn) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeBool(m.CaptureRx)
+	buf.EncodeBool(m.CaptureTx)
+	buf.EncodeBool(m.CaptureDrop)
+	buf.EncodeBool(m.Filter)
+	buf.EncodeBool(m.PreallocateData)
+	buf.EncodeBool(m.FreeData)
+	buf.EncodeUint32(m.MaxPackets)
+	buf.EncodeUint32(m.MaxBytesPerPacket)
+	buf.EncodeUint32(uint32(m.SwIfIndex))
+	buf.EncodeString(m.Error, 128)
+	buf.EncodeString(m.Filename, 64)
+	return buf.Bytes(), nil
+}
+func (m *PcapTraceOn) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.CaptureRx = buf.DecodeBool()
+	m.CaptureTx = buf.DecodeBool()
+	m.CaptureDrop = buf.DecodeBool()
+	m.Filter = buf.DecodeBool()
+	m.PreallocateData = buf.DecodeBool()
+	m.FreeData = buf.DecodeBool()
+	m.MaxPackets = buf.DecodeUint32()
+	m.MaxBytesPerPacket = buf.DecodeUint32()
+	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+	m.Error = buf.DecodeString(128)
+	m.Filename = buf.DecodeString(64)
+	return nil
+}
+
+// PcapTraceOnReply defines message 'pcap_trace_on_reply'.
+type PcapTraceOnReply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *PcapTraceOnReply) Reset()               { *m = PcapTraceOnReply{} }
+func (*PcapTraceOnReply) GetMessageName() string { return "pcap_trace_on_reply" }
+func (*PcapTraceOnReply) GetCrcString() string   { return "e8d4e804" }
+func (*PcapTraceOnReply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *PcapTraceOnReply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *PcapTraceOnReply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *PcapTraceOnReply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
 // Set or delete one or all ip addresses on a specified interface
 //   - sw_if_index - index of the interface to add/del addresses
 //   - is_add - add address if non-zero, else delete
@@ -2824,13 +2999,6 @@ func (m *SwInterfaceTxPlacementGet) Unmarshal(b []byte) error {
 	return nil
 }
 
-// get the tx queue placement of interface(s)
-//   - cursor - optional, it allows client to continue a dump
-//   - sw_if_index - optional interface index for which queue placement to
-//     be requested. sw_if_index = ~0 will get the placement information for all
-//     interfaces. It will not get information related to sub-interfaces, p2p
-//     and pipe interfaces.
-//
 // SwInterfaceTxPlacementGetReply defines message 'sw_interface_tx_placement_get_reply'.
 type SwInterfaceTxPlacementGetReply struct {
 	Retval int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -2966,6 +3134,10 @@ func file_interfaces_binapi_init() {
 	api.RegisterMessage((*HwInterfaceSetMtuReply)(nil), "hw_interface_set_mtu_reply_e8d4e804")
 	api.RegisterMessage((*InterfaceNameRenumber)(nil), "interface_name_renumber_2b8858b8")
 	api.RegisterMessage((*InterfaceNameRenumberReply)(nil), "interface_name_renumber_reply_e8d4e804")
+	api.RegisterMessage((*PcapTraceOff)(nil), "pcap_trace_off_51077d14")
+	api.RegisterMessage((*PcapTraceOffReply)(nil), "pcap_trace_off_reply_e8d4e804")
+	api.RegisterMessage((*PcapTraceOn)(nil), "pcap_trace_on_cb39e968")
+	api.RegisterMessage((*PcapTraceOnReply)(nil), "pcap_trace_on_reply_e8d4e804")
 	api.RegisterMessage((*SwInterfaceAddDelAddress)(nil), "sw_interface_add_del_address_5463d73b")
 	api.RegisterMessage((*SwInterfaceAddDelAddressReply)(nil), "sw_interface_add_del_address_reply_e8d4e804")
 	api.RegisterMessage((*SwInterfaceAddDelMacAddress)(nil), "sw_interface_add_del_mac_address_638bb9f4")
@@ -3039,6 +3211,10 @@ func AllMessages() []api.Message {
 		(*HwInterfaceSetMtuReply)(nil),
 		(*InterfaceNameRenumber)(nil),
 		(*InterfaceNameRenumberReply)(nil),
+		(*PcapTraceOff)(nil),
+		(*PcapTraceOffReply)(nil),
+		(*PcapTraceOn)(nil),
+		(*PcapTraceOnReply)(nil),
 		(*SwInterfaceAddDelAddress)(nil),
 		(*SwInterfaceAddDelAddressReply)(nil),
 		(*SwInterfaceAddDelMacAddress)(nil),
diff --git a/vpplink/generated/bindings/interface/interface_rpc.ba.go b/vpplink/generated/bindings/interface/interface_rpc.ba.go
index a514c8bd..a823d8c9 100644
--- a/vpplink/generated/bindings/interface/interface_rpc.ba.go
+++ b/vpplink/generated/bindings/interface/interface_rpc.ba.go
@@ -23,6 +23,8 @@ type RPCService interface {
 	GetBuffersStats(ctx context.Context, in *GetBuffersStats) (*GetBuffersStatsReply, error)
 	HwInterfaceSetMtu(ctx context.Context, in *HwInterfaceSetMtu) (*HwInterfaceSetMtuReply, error)
 	InterfaceNameRenumber(ctx context.Context, in *InterfaceNameRenumber) (*InterfaceNameRenumberReply, error)
+	PcapTraceOff(ctx context.Context, in *PcapTraceOff) (*PcapTraceOffReply, error)
+	PcapTraceOn(ctx context.Context, in *PcapTraceOn) (*PcapTraceOnReply, error)
 	SwInterfaceAddDelAddress(ctx context.Context, in *SwInterfaceAddDelAddress) (*SwInterfaceAddDelAddressReply, error)
 	SwInterfaceAddDelMacAddress(ctx context.Context, in *SwInterfaceAddDelMacAddress) (*SwInterfaceAddDelMacAddressReply, error)
 	SwInterfaceAddressReplaceBegin(ctx context.Context, in *SwInterfaceAddressReplaceBegin) (*SwInterfaceAddressReplaceBeginReply, error)
@@ -146,6 +148,24 @@ func (c *serviceClient) InterfaceNameRenumber(ctx context.Context, in *Interface
 	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
+func (c *serviceClient) PcapTraceOff(ctx context.Context, in *PcapTraceOff) (*PcapTraceOffReply, error) {
+	out := new(PcapTraceOffReply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, api.RetvalToVPPApiError(out.Retval)
+}
+
+func (c *serviceClient) PcapTraceOn(ctx context.Context, in *PcapTraceOn) (*PcapTraceOnReply, error) {
+	out := new(PcapTraceOnReply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, api.RetvalToVPPApiError(out.Retval)
+}
+
 func (c *serviceClient) SwInterfaceAddDelAddress(ctx context.Context, in *SwInterfaceAddDelAddress) (*SwInterfaceAddDelAddressReply, error) {
 	out := new(SwInterfaceAddDelAddressReply)
 	err := c.conn.Invoke(ctx, in, out)
diff --git a/vpplink/generated/bindings/ip/ip.ba.go b/vpplink/generated/bindings/ip/ip.ba.go
index b8ebeef9..47961d98 100644
--- a/vpplink/generated/bindings/ip/ip.ba.go
+++ b/vpplink/generated/bindings/ip/ip.ba.go
@@ -3,9 +3,9 @@
 // Package ip contains generated bindings for API file ip.api.
 //
 // Contents:
-// -  2 enums
+// -  3 enums
 // -  7 structs
-// - 91 messages
+// - 93 messages
 package ip
 
 import (
@@ -29,7 +29,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "ip"
 	APIVersion = "3.2.0"
-	VersionCrc = 0x41299705
+	VersionCrc = 0xbd2f873b
 )
 
 // IPReassType defines enum 'ip_reass_type'.
@@ -123,6 +123,73 @@ func (x IPFlowHashConfig) String() string {
 	return s
 }
 
+// IPFlowHashConfigV2 defines enum 'ip_flow_hash_config_v2'.
+type IPFlowHashConfigV2 uint32
+
+const (
+	IP_API_V2_FLOW_HASH_SRC_IP     IPFlowHashConfigV2 = 1
+	IP_API_V2_FLOW_HASH_DST_IP     IPFlowHashConfigV2 = 2
+	IP_API_V2_FLOW_HASH_SRC_PORT   IPFlowHashConfigV2 = 4
+	IP_API_V2_FLOW_HASH_DST_PORT   IPFlowHashConfigV2 = 8
+	IP_API_V2_FLOW_HASH_PROTO      IPFlowHashConfigV2 = 16
+	IP_API_V2_FLOW_HASH_REVERSE    IPFlowHashConfigV2 = 32
+	IP_API_V2_FLOW_HASH_SYMETRIC   IPFlowHashConfigV2 = 64
+	IP_API_V2_FLOW_HASH_FLOW_LABEL IPFlowHashConfigV2 = 128
+	IP_API_V2_FLOW_HASH_GTPV1_TEID IPFlowHashConfigV2 = 256
+)
+
+var (
+	IPFlowHashConfigV2_name = map[uint32]string{
+		1:   "IP_API_V2_FLOW_HASH_SRC_IP",
+		2:   "IP_API_V2_FLOW_HASH_DST_IP",
+		4:   "IP_API_V2_FLOW_HASH_SRC_PORT",
+		8:   "IP_API_V2_FLOW_HASH_DST_PORT",
+		16:  "IP_API_V2_FLOW_HASH_PROTO",
+		32:  "IP_API_V2_FLOW_HASH_REVERSE",
+		64:  "IP_API_V2_FLOW_HASH_SYMETRIC",
+		128: "IP_API_V2_FLOW_HASH_FLOW_LABEL",
+		256: "IP_API_V2_FLOW_HASH_GTPV1_TEID",
+	}
+	IPFlowHashConfigV2_value = map[string]uint32{
+		"IP_API_V2_FLOW_HASH_SRC_IP":     1,
+		"IP_API_V2_FLOW_HASH_DST_IP":     2,
+		"IP_API_V2_FLOW_HASH_SRC_PORT":   4,
+		"IP_API_V2_FLOW_HASH_DST_PORT":   8,
+		"IP_API_V2_FLOW_HASH_PROTO":      16,
+		"IP_API_V2_FLOW_HASH_REVERSE":    32,
+		"IP_API_V2_FLOW_HASH_SYMETRIC":   64,
+		"IP_API_V2_FLOW_HASH_FLOW_LABEL": 128,
+		"IP_API_V2_FLOW_HASH_GTPV1_TEID": 256,
+	}
+)
+
+func (x IPFlowHashConfigV2) String() string {
+	s, ok := IPFlowHashConfigV2_name[uint32(x)]
+	if ok {
+		return s
+	}
+	str := func(n uint32) string {
+		s, ok := IPFlowHashConfigV2_name[uint32(n)]
+		if ok {
+			return s
+		}
+		return "IPFlowHashConfigV2(" + strconv.Itoa(int(n)) + ")"
+	}
+	for i := uint32(0); i <= 32; i++ {
+		val := uint32(x)
+		if val&(1<<i) != 0 {
+			if s != "" {
+				s += "|"
+			}
+			s += str(1 << i)
+		}
+	}
+	if s == "" {
+		return str(uint32(x))
+	}
+	return s
+}
+
 // IPMroute defines type 'ip_mroute'.
 type IPMroute struct {
 	TableID    uint32                    `binapi:"u32,name=table_id" json:"table_id,omitempty"`
@@ -500,9 +567,6 @@ func (m *IoamEnableReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IP Multicast Route Details
-//   - route - Details of the route
-//
 // IPAddressDetails defines message 'ip_address_details'.
 type IPAddressDetails struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -546,9 +610,6 @@ func (m *IPAddressDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IP Multicast Route Details
-//   - route - Details of the route
-//
 // IPAddressDump defines message 'ip_address_dump'.
 type IPAddressDump struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -586,10 +647,6 @@ func (m *IPAddressDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IP punt redirect rule
-//   - punt - punt definition
-//   - is_add - 1 to add punt_redirect rule, 0 to delete
-//
 // IPContainerProxyAddDel defines message 'ip_container_proxy_add_del'.
 type IPContainerProxyAddDel struct {
 	Pfx       ip_types.Prefix                `binapi:"prefix,name=pfx" json:"pfx,omitempty"`
@@ -672,10 +729,6 @@ func (m *IPContainerProxyAddDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IP punt redirect rule
-//   - punt - punt definition
-//   - is_add - 1 to add punt_redirect rule, 0 to delete
-//
 // IPContainerProxyDetails defines message 'ip_container_proxy_details'.
 type IPContainerProxyDetails struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -719,10 +772,6 @@ func (m *IPContainerProxyDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IP punt redirect rule
-//   - punt - punt definition
-//   - is_add - 1 to add punt_redirect rule, 0 to delete
-//
 // IPContainerProxyDump defines message 'ip_container_proxy_dump'.
 type IPContainerProxyDump struct{}
 
@@ -750,9 +799,6 @@ func (m *IPContainerProxyDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IP unnumbered configurations
-//   - sw_if_index ~0 for all interfaces, else the interface desired
-//
 // IPDetails defines message 'ip_details'.
 type IPDetails struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -790,9 +836,6 @@ func (m *IPDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IP unnumbered configurations
-//   - sw_if_index ~0 for all interfaces, else the interface desired
-//
 // IPDump defines message 'ip_dump'.
 type IPDump struct {
 	IsIPv6 bool `binapi:"bool,name=is_ipv6" json:"is_ipv6,omitempty"`
@@ -927,7 +970,6 @@ func (m *IPLocalReassGet) Unmarshal(b []byte) error {
 	return nil
 }
 
-// get status of local reassembly
 // IPLocalReassGetReply defines message 'ip_local_reass_get_reply'.
 type IPLocalReassGetReply struct {
 	Retval       int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -1129,28 +1171,6 @@ func (m *IPMrouteAddDel) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add / del route request
-//
-//	Adds a route, consisting both of the MFIB entry to match packets
-//	(which may already exist) and a path to send those packets down.
-//	Routes can be entered repeatedly to add multiple paths.  Deletions are
-//	per-path.
-//	- table_id - fib table /vrf associated with the route
-//	- is_add - true if adding a route; false if deleting one
-//	- is_ipv6 - true iff all the addresses are v6
-//	- entry_flags - see fib_entry_flag_t
-//	- itf_flags - see mfib_entry_flags_t
-//	- next_hop_afi - see dpo_proto_t; the type of destination description
-//	- src_address - the source of the packet
-//	- grp_address - the group the packet is destined to
-//	- nh_address - the nexthop to forward the packet to
-//	- next_hop_sw_if_index - interface to emit packet on
-//	BIER AFIs use the BIER imposition ID.  v4 and v6 AFIs use either the
-//	interface or the nexthop address.
-//	Note that if the route is source-specific (S is supplied, not all 0s),
-//	the prefix match is treated as exact (prefixlen /32 or /128).
-//	FIXME not complete yet
-//
 // IPMrouteAddDelReply defines message 'ip_mroute_add_del_reply'.
 type IPMrouteAddDelReply struct {
 	Retval     int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -1363,7 +1383,6 @@ func (m *IPMrouteDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IP multicast fib table
 // IPMtableDetails defines message 'ip_mtable_details'.
 type IPMtableDetails struct {
 	Table IPTable `binapi:"ip_table,name=table" json:"table,omitempty"`
@@ -1431,14 +1450,6 @@ func (m *IPMtableDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// @brief Set a Path MTU value. i.e. a MTU value for a given neighbour.
-//
-//	       The neighbour can be described as attached (w/ interface and next-hop)
-//	       or remote (w/ table_id and next-hop);
-//	- table_id - table-ID for next-hop
-//	- nh - Next hop
-//	- path_mtu - value to set, 0 is disable.
-//
 // IPPathMtuDetails defines message 'ip_path_mtu_details'.
 type IPPathMtuDetails struct {
 	Pmtu IPPathMtu `binapi:"ip_path_mtu,name=pmtu" json:"pmtu,omitempty"`
@@ -1487,14 +1498,6 @@ func (m *IPPathMtuDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// @brief Set a Path MTU value. i.e. a MTU value for a given neighbour.
-//
-//	       The neighbour can be described as attached (w/ interface and next-hop)
-//	       or remote (w/ table_id and next-hop);
-//	- table_id - table-ID for next-hop
-//	- nh - Next hop
-//	- path_mtu - value to set, 0 is disable.
-//
 // IPPathMtuGet defines message 'ip_path_mtu_get'.
 type IPPathMtuGet struct {
 	Cursor uint32 `binapi:"u32,name=cursor" json:"cursor,omitempty"`
@@ -1528,14 +1531,6 @@ func (m *IPPathMtuGet) Unmarshal(b []byte) error {
 	return nil
 }
 
-// @brief Set a Path MTU value. i.e. a MTU value for a given neighbour.
-//
-//	       The neighbour can be described as attached (w/ interface and next-hop)
-//	       or remote (w/ table_id and next-hop);
-//	- table_id - table-ID for next-hop
-//	- nh - Next hop
-//	- path_mtu - value to set, 0 is disable.
-//
 // IPPathMtuGetReply defines message 'ip_path_mtu_get_reply'.
 type IPPathMtuGetReply struct {
 	Retval int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -1573,14 +1568,6 @@ func (m *IPPathMtuGetReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// @brief Set a Path MTU value. i.e. a MTU value for a given neighbour.
-//
-//	       The neighbour can be described as attached (w/ interface and next-hop)
-//	       or remote (w/ table_id and next-hop);
-//	- table_id - table-ID for next-hop
-//	- nh - Next hop
-//	- path_mtu - value to set, 0 is disable.
-//
 // IPPathMtuReplaceBegin defines message 'ip_path_mtu_replace_begin'.
 type IPPathMtuReplaceBegin struct{}
 
@@ -1641,14 +1628,6 @@ func (m *IPPathMtuReplaceBeginReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// @brief Set a Path MTU value. i.e. a MTU value for a given neighbour.
-//
-//	       The neighbour can be described as attached (w/ interface and next-hop)
-//	       or remote (w/ table_id and next-hop);
-//	- table_id - table-ID for next-hop
-//	- nh - Next hop
-//	- path_mtu - value to set, 0 is disable.
-//
 // IPPathMtuReplaceEnd defines message 'ip_path_mtu_replace_end'.
 type IPPathMtuReplaceEnd struct{}
 
@@ -1928,10 +1907,6 @@ func (m *IPPuntRedirect) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IP punt redirect
-//   - punt - punt definition
-//   - is_add - 1 to add neighbor, 0 to delete
-//
 // IPPuntRedirectDetails defines message 'ip_punt_redirect_details'.
 type IPPuntRedirectDetails struct {
 	Punt PuntRedirect `binapi:"punt_redirect,name=punt" json:"punt,omitempty"`
@@ -1974,10 +1949,6 @@ func (m *IPPuntRedirectDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IP punt redirect
-//   - punt - punt definition
-//   - is_add - 1 to add neighbor, 0 to delete
-//
 // IPPuntRedirectDump defines message 'ip_punt_redirect_dump'.
 type IPPuntRedirectDump struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -2049,10 +2020,6 @@ func (m *IPPuntRedirectReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IP punt redirect rule
-//   - punt - punt definition
-//   - is_add - 1 to add punt_redirect rule, 0 to delete
-//
 // IPPuntRedirectV2Details defines message 'ip_punt_redirect_v2_details'.
 type IPPuntRedirectV2Details struct {
 	Punt PuntRedirectV2 `binapi:"punt_redirect_v2,name=punt" json:"punt,omitempty"`
@@ -2165,10 +2132,6 @@ func (m *IPPuntRedirectV2Details) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IP punt redirect rule
-//   - punt - punt definition
-//   - is_add - 1 to add punt_redirect rule, 0 to delete
-//
 // IPPuntRedirectV2Dump defines message 'ip_punt_redirect_v2_dump'.
 type IPPuntRedirectV2Dump struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -2291,9 +2254,6 @@ func (m *IPReassemblyEnableDisableReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// iOAM disable
-//   - index - MAP Domain index
-//
 // IPReassemblyGet defines message 'ip_reassembly_get'.
 type IPReassemblyGet struct {
 	IsIP6 bool        `binapi:"bool,name=is_ip6" json:"is_ip6,omitempty"`
@@ -2331,9 +2291,6 @@ func (m *IPReassemblyGet) Unmarshal(b []byte) error {
 	return nil
 }
 
-// iOAM disable
-//   - index - MAP Domain index
-//
 // IPReassemblyGetReply defines message 'ip_reassembly_get_reply'.
 type IPReassemblyGetReply struct {
 	Retval               int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -2387,9 +2344,6 @@ func (m *IPReassemblyGetReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// iOAM disable
-//   - index - MAP Domain index
-//
 // IPReassemblySet defines message 'ip_reassembly_set'.
 type IPReassemblySet struct {
 	TimeoutMs            uint32      `binapi:"u32,name=timeout_ms" json:"timeout_ms,omitempty"`
@@ -2612,13 +2566,6 @@ func (m *IPRouteAddDel) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add / del route request
-//   - is_multipath - Set to 1 if these paths will be added/removed
-//     to/from the existing set, or 0 to replace
-//     the existing set.
-//     is_add=0 & is_multipath=0 implies delete all paths
-//   - is_add - Are the paths being added or removed
-//
 // IPRouteAddDelReply defines message 'ip_route_add_del_reply'.
 type IPRouteAddDelReply struct {
 	Retval     int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -2656,13 +2603,6 @@ func (m *IPRouteAddDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add / del route request
-//   - is_multipath - Set to 1 if these paths will be added/removed
-//     to/from the existing set, or 0 to replace
-//     the existing set.
-//     is_add=0 & is_multipath=0 implies delete all paths
-//   - is_add - Are the paths being added or removed
-//
 // IPRouteAddDelV2 defines message 'ip_route_add_del_v2'.
 // InProgress: the message form may change in the future versions
 type IPRouteAddDelV2 struct {
@@ -2796,13 +2736,6 @@ func (m *IPRouteAddDelV2) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add / del route request
-//   - is_multipath - Set to 1 if these paths will be added/removed
-//     to/from the existing set, or 0 to replace
-//     the existing set.
-//     is_add=0 & is_multipath=0 implies delete all paths
-//   - is_add - Are the paths being added or removed
-//
 // IPRouteAddDelV2Reply defines message 'ip_route_add_del_v2_reply'.
 // InProgress: the message form may change in the future versions
 type IPRouteAddDelV2Reply struct {
@@ -3190,11 +3123,6 @@ func (m *IPRouteLookupReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Lookup IP route from a table
-//   - table_id - The IP table to look the route up in
-//   - exact - 0 for normal route lookup, 1 for exact match only
-//   - prefix - The prefix (or host) for route lookup.
-//
 // IPRouteLookupV2 defines message 'ip_route_lookup_v2'.
 // InProgress: the message form may change in the future versions
 type IPRouteLookupV2 struct {
@@ -3243,10 +3171,6 @@ func (m *IPRouteLookupV2) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IP FIB table lookup response
-//   - retval - return code of the lookup
-//   - route - The route entry in the table if found
-//
 // IPRouteLookupV2Reply defines message 'ip_route_lookup_v2_reply'.
 // InProgress: the message form may change in the future versions
 type IPRouteLookupV2Reply struct {
@@ -3376,9 +3300,6 @@ func (m *IPRouteLookupV2Reply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IP FIB table entry response
-//   - route The route entry in the table
-//
 // IPRouteV2Details defines message 'ip_route_v2_details'.
 // InProgress: the message form may change in the future versions
 type IPRouteV2Details struct {
@@ -3504,11 +3425,6 @@ func (m *IPRouteV2Details) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IP routes from a table
-//   - src The entity adding the route. either 0 for default
-//     or a value returned from fib_source_sdd.
-//   - table - The table from which to dump routes (ony ID an AF are needed)
-//
 // IPRouteV2Dump defines message 'ip_route_v2_dump'.
 // InProgress: the message form may change in the future versions
 type IPRouteV2Dump struct {
@@ -3907,18 +3823,6 @@ func (m *IPTableAllocate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Allocate an unused table
-//
-//	         A table can be added multiple times.
-//	         If a large number of tables are in use (millions), this API might
-//	         fail to find a free ID with very low probability, and will return
-//	         EAGAIN. A subsequent attempt may be successful.
-//	- table - if table.table_id == ~0, vpp allocates an unused table_id and
-//	                  proceeds as in ip_table_add_del with is_add = true
-//	               if table.table_id != ~0, vpp uses the table.table_id and
-//	                  proceeds as in ip_table_add_del with is_add = true
-//	               table.table_id should never be 0
-//
 // IPTableAllocateReply defines message 'ip_table_allocate_reply'.
 type IPTableAllocateReply struct {
 	Retval int32   `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -4350,9 +4254,6 @@ func (m *IPUnnumberedDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IP unnumbered configurations
-//   - sw_if_index ~0 for all interfaces, else the interface desired
-//
 // MfibSignalDetails defines message 'mfib_signal_details'.
 type MfibSignalDetails struct {
 	SwIfIndex    interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -4412,9 +4313,6 @@ func (m *MfibSignalDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IP unnumbered configurations
-//   - sw_if_index ~0 for all interfaces, else the interface desired
-//
 // MfibSignalDump defines message 'mfib_signal_dump'.
 type MfibSignalDump struct{}
 
@@ -4708,6 +4606,93 @@ func (m *SetIPFlowHashV2Reply) Unmarshal(b []byte) error {
 	return nil
 }
 
+// @brief flow hash settings for an IP table
+//   - src - include src in flow hash
+//   - dst - include dst in flow hash
+//   - sport - include sport in flow hash
+//   - dport - include dport in flow hash
+//   - proto - include proto in flow hash
+//   - reverse - include reverse in flow hash
+//   - symmetric - include symmetry in flow hash
+//   - flowlabel - include flowlabel in flow hash
+//   - gtpv1teid - include gtpv1teid in flow hash
+//
+// SetIPFlowHashV3 defines message 'set_ip_flow_hash_v3'.
+// InProgress: the message form may change in the future versions
+type SetIPFlowHashV3 struct {
+	TableID        uint32                 `binapi:"u32,name=table_id" json:"table_id,omitempty"`
+	Af             ip_types.AddressFamily `binapi:"address_family,name=af" json:"af,omitempty"`
+	FlowHashConfig IPFlowHashConfigV2     `binapi:"ip_flow_hash_config_v2,name=flow_hash_config" json:"flow_hash_config,omitempty"`
+}
+
+func (m *SetIPFlowHashV3) Reset()               { *m = SetIPFlowHashV3{} }
+func (*SetIPFlowHashV3) GetMessageName() string { return "set_ip_flow_hash_v3" }
+func (*SetIPFlowHashV3) GetCrcString() string   { return "b7876e07" }
+func (*SetIPFlowHashV3) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *SetIPFlowHashV3) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.TableID
+	size += 1 // m.Af
+	size += 4 // m.FlowHashConfig
+	return size
+}
+func (m *SetIPFlowHashV3) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(m.TableID)
+	buf.EncodeUint8(uint8(m.Af))
+	buf.EncodeUint32(uint32(m.FlowHashConfig))
+	return buf.Bytes(), nil
+}
+func (m *SetIPFlowHashV3) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.TableID = buf.DecodeUint32()
+	m.Af = ip_types.AddressFamily(buf.DecodeUint8())
+	m.FlowHashConfig = IPFlowHashConfigV2(buf.DecodeUint32())
+	return nil
+}
+
+// SetIPFlowHashV3Reply defines message 'set_ip_flow_hash_v3_reply'.
+// InProgress: the message form may change in the future versions
+type SetIPFlowHashV3Reply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *SetIPFlowHashV3Reply) Reset()               { *m = SetIPFlowHashV3Reply{} }
+func (*SetIPFlowHashV3Reply) GetMessageName() string { return "set_ip_flow_hash_v3_reply" }
+func (*SetIPFlowHashV3Reply) GetCrcString() string   { return "e8d4e804" }
+func (*SetIPFlowHashV3Reply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *SetIPFlowHashV3Reply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *SetIPFlowHashV3Reply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *SetIPFlowHashV3Reply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
 // IPv6 interface enable / disable request
 //   - sw_if_index - interface used to reach neighbor
 //   - enable - if non-zero enable ip6 on interface, else disable
@@ -5033,6 +5018,8 @@ func file_ip_binapi_init() {
 	api.RegisterMessage((*SetIPFlowHashRouterIDReply)(nil), "set_ip_flow_hash_router_id_reply_e8d4e804")
 	api.RegisterMessage((*SetIPFlowHashV2)(nil), "set_ip_flow_hash_v2_6d132100")
 	api.RegisterMessage((*SetIPFlowHashV2Reply)(nil), "set_ip_flow_hash_v2_reply_e8d4e804")
+	api.RegisterMessage((*SetIPFlowHashV3)(nil), "set_ip_flow_hash_v3_b7876e07")
+	api.RegisterMessage((*SetIPFlowHashV3Reply)(nil), "set_ip_flow_hash_v3_reply_e8d4e804")
 	api.RegisterMessage((*SwInterfaceIP6EnableDisable)(nil), "sw_interface_ip6_enable_disable_ae6cfcfb")
 	api.RegisterMessage((*SwInterfaceIP6EnableDisableReply)(nil), "sw_interface_ip6_enable_disable_reply_e8d4e804")
 	api.RegisterMessage((*SwInterfaceIP6GetLinkLocalAddress)(nil), "sw_interface_ip6_get_link_local_address_f9e6675e")
@@ -5129,6 +5116,8 @@ func AllMessages() []api.Message {
 		(*SetIPFlowHashRouterIDReply)(nil),
 		(*SetIPFlowHashV2)(nil),
 		(*SetIPFlowHashV2Reply)(nil),
+		(*SetIPFlowHashV3)(nil),
+		(*SetIPFlowHashV3Reply)(nil),
 		(*SwInterfaceIP6EnableDisable)(nil),
 		(*SwInterfaceIP6EnableDisableReply)(nil),
 		(*SwInterfaceIP6GetLinkLocalAddress)(nil),
diff --git a/vpplink/generated/bindings/ip/ip_rpc.ba.go b/vpplink/generated/bindings/ip/ip_rpc.ba.go
index 05653f04..5a2cb470 100644
--- a/vpplink/generated/bindings/ip/ip_rpc.ba.go
+++ b/vpplink/generated/bindings/ip/ip_rpc.ba.go
@@ -55,6 +55,7 @@ type RPCService interface {
 	SetIPFlowHash(ctx context.Context, in *SetIPFlowHash) (*SetIPFlowHashReply, error)
 	SetIPFlowHashRouterID(ctx context.Context, in *SetIPFlowHashRouterID) (*SetIPFlowHashRouterIDReply, error)
 	SetIPFlowHashV2(ctx context.Context, in *SetIPFlowHashV2) (*SetIPFlowHashV2Reply, error)
+	SetIPFlowHashV3(ctx context.Context, in *SetIPFlowHashV3) (*SetIPFlowHashV3Reply, error)
 	SwInterfaceIP6EnableDisable(ctx context.Context, in *SwInterfaceIP6EnableDisable) (*SwInterfaceIP6EnableDisableReply, error)
 	SwInterfaceIP6GetLinkLocalAddress(ctx context.Context, in *SwInterfaceIP6GetLinkLocalAddress) (*SwInterfaceIP6GetLinkLocalAddressReply, error)
 	SwInterfaceIP6SetLinkLocalAddress(ctx context.Context, in *SwInterfaceIP6SetLinkLocalAddress) (*SwInterfaceIP6SetLinkLocalAddressReply, error)
@@ -888,6 +889,15 @@ func (c *serviceClient) SetIPFlowHashV2(ctx context.Context, in *SetIPFlowHashV2
 	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
+func (c *serviceClient) SetIPFlowHashV3(ctx context.Context, in *SetIPFlowHashV3) (*SetIPFlowHashV3Reply, error) {
+	out := new(SetIPFlowHashV3Reply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, api.RetvalToVPPApiError(out.Retval)
+}
+
 func (c *serviceClient) SwInterfaceIP6EnableDisable(ctx context.Context, in *SwInterfaceIP6EnableDisable) (*SwInterfaceIP6EnableDisableReply, error) {
 	out := new(SwInterfaceIP6EnableDisableReply)
 	err := c.conn.Invoke(ctx, in, out)
diff --git a/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go b/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go
index 8eb9ce5f..298b86b5 100644
--- a/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go
+++ b/vpplink/generated/bindings/ip6_nd/ip6_nd.ba.go
@@ -3,8 +3,8 @@
 // Package ip6_nd contains generated bindings for API file ip6_nd.api.
 //
 // Contents:
-// -  1 struct
-// - 15 messages
+// -  2 structs
+// - 17 messages
 package ip6_nd
 
 import (
@@ -22,8 +22,8 @@ const _ = api.GoVppAPIPackageIsVersion2
 
 const (
 	APIFile    = "ip6_nd"
-	APIVersion = "1.0.0"
-	VersionCrc = 0x64750117
+	APIVersion = "1.1.0"
+	VersionCrc = 0x5f19a809
 )
 
 // IP6RaPrefixInfo defines type 'ip6_ra_prefix_info'.
@@ -34,6 +34,19 @@ type IP6RaPrefixInfo struct {
 	PreferredTime uint32          `binapi:"u32,name=preferred_time" json:"preferred_time,omitempty"`
 }
 
+// IP6ndRaPrefix defines type 'ip6nd_ra_prefix'.
+type IP6ndRaPrefix struct {
+	Prefix                ip_types.Prefix `binapi:"prefix,name=prefix" json:"prefix,omitempty"`
+	OnlinkFlag            bool            `binapi:"bool,name=onlink_flag" json:"onlink_flag,omitempty"`
+	AutonomousFlag        bool            `binapi:"bool,name=autonomous_flag" json:"autonomous_flag,omitempty"`
+	ValLifetime           uint32          `binapi:"u32,name=val_lifetime" json:"val_lifetime,omitempty"`
+	PrefLifetime          uint32          `binapi:"u32,name=pref_lifetime" json:"pref_lifetime,omitempty"`
+	ValidLifetimeExpires  float64         `binapi:"f64,name=valid_lifetime_expires" json:"valid_lifetime_expires,omitempty"`
+	PrefLifetimeExpires   float64         `binapi:"f64,name=pref_lifetime_expires" json:"pref_lifetime_expires,omitempty"`
+	DecrementLifetimeFlag bool            `binapi:"bool,name=decrement_lifetime_flag" json:"decrement_lifetime_flag,omitempty"`
+	NoAdvertise           bool            `binapi:"bool,name=no_advertise" json:"no_advertise,omitempty"`
+}
+
 // Tell client about a router advertisement event
 //   - pid - client pid registered to receive notification
 //   - current_hop_limit - RA current hop limit
@@ -603,6 +616,267 @@ func (m *SwInterfaceIP6ndRaConfigReply) Unmarshal(b []byte) error {
 	return nil
 }
 
+// Details on IPv6 Router Advertisements for a single interface
+//   - sw_if_index - interface index the details are belong to
+//   - cur_hop_limit - current hop limit
+//   - adv_managed_flag - if true, enable DHCP for address
+//   - adv_other_flag - if true, Enable DHCP for other information
+//   - adv_router_lifetime - lifetime associated with the default router in
+//     seconds (zero indicates that the router is not
+//     a default router)
+//   - adv_neighbor_reachable_time - number of milliseconds within which a
+//     neighbor is assumed to be reachable
+//     (zero means unspecified)
+//   - adv_retransmit_interval - number of milliseconds between
+//     retransmitted Neighbor Solicitation
+//     messages (zero means unspecified)
+//   - adv_link_mtu - MTU that all the nodes on a link use
+//   - send_radv - if true, send periodic Router Advertisements
+//   - cease_radv - if true, cease to send periodic Router Advertisements
+//   - send_unicast - if true, destination address of a Router
+//     Advertisement message will use the source address of
+//     the Router Solicitation message (when available).
+//     Otherwise, multicast address will be used
+//   - adv_link_layer_address - if true, add link layer address option
+//   - max_radv_interval - maximum time in seconds allowed between sending
+//     unsolicited multicast Router Advertisements
+//   - min_radv_interval - minimum time in seconds allowed between sending
+//     unsolicited multicast Router Advertisements
+//   - last_radv_time - number of seconds since the last time a solicited
+//     Router Advertisement message was sent (zero means
+//     never)
+//   - last_multicast_time - number of seconds since the last time a
+//     multicast Router Advertisements message was
+//     sent (zero means never)
+//   - next_multicast_time - number of seconds within which next time a
+//     multicast Router Advertisement message will be
+//     sent (zero means never)
+//   - initial_adverts_count - number of initial Router Advertisement
+//     messages to send
+//   - initial_adverts_interval - number of seconds between initial Router
+//     Advertisement messages
+//   - initial_adverts_sent - if true, all initial Router Advertisement
+//     messages were sent
+//   - n_advertisements_sent - number of Router Advertisements sent
+//   - n_solicitations_rcvd - number of Router Solicitations received
+//   - n_solicitations_dropped - number of Router Solicitations dropped
+//   - n_prefixes - number of prefix entries
+//   - prefixes - array of prefix entries
+//
+// SwInterfaceIP6ndRaDetails defines message 'sw_interface_ip6nd_ra_details'.
+// InProgress: the message form may change in the future versions
+type SwInterfaceIP6ndRaDetails struct {
+	SwIfIndex                interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
+	CurHopLimit              uint8                          `binapi:"u8,name=cur_hop_limit" json:"cur_hop_limit,omitempty"`
+	AdvManagedFlag           bool                           `binapi:"bool,name=adv_managed_flag" json:"adv_managed_flag,omitempty"`
+	AdvOtherFlag             bool                           `binapi:"bool,name=adv_other_flag" json:"adv_other_flag,omitempty"`
+	AdvRouterLifetime        uint16                         `binapi:"u16,name=adv_router_lifetime" json:"adv_router_lifetime,omitempty"`
+	AdvNeighborReachableTime uint32                         `binapi:"u32,name=adv_neighbor_reachable_time" json:"adv_neighbor_reachable_time,omitempty"`
+	AdvRetransmitInterval    uint32                         `binapi:"u32,name=adv_retransmit_interval" json:"adv_retransmit_interval,omitempty"`
+	AdvLinkMtu               uint32                         `binapi:"u32,name=adv_link_mtu" json:"adv_link_mtu,omitempty"`
+	SendRadv                 bool                           `binapi:"bool,name=send_radv" json:"send_radv,omitempty"`
+	CeaseRadv                bool                           `binapi:"bool,name=cease_radv" json:"cease_radv,omitempty"`
+	SendUnicast              bool                           `binapi:"bool,name=send_unicast" json:"send_unicast,omitempty"`
+	AdvLinkLayerAddress      bool                           `binapi:"bool,name=adv_link_layer_address" json:"adv_link_layer_address,omitempty"`
+	MaxRadvInterval          float64                        `binapi:"f64,name=max_radv_interval" json:"max_radv_interval,omitempty"`
+	MinRadvInterval          float64                        `binapi:"f64,name=min_radv_interval" json:"min_radv_interval,omitempty"`
+	LastRadvTime             float64                        `binapi:"f64,name=last_radv_time" json:"last_radv_time,omitempty"`
+	LastMulticastTime        float64                        `binapi:"f64,name=last_multicast_time" json:"last_multicast_time,omitempty"`
+	NextMulticastTime        float64                        `binapi:"f64,name=next_multicast_time" json:"next_multicast_time,omitempty"`
+	InitialAdvertsCount      uint32                         `binapi:"u32,name=initial_adverts_count" json:"initial_adverts_count,omitempty"`
+	InitialAdvertsInterval   float64                        `binapi:"f64,name=initial_adverts_interval" json:"initial_adverts_interval,omitempty"`
+	InitialAdvertsSent       bool                           `binapi:"bool,name=initial_adverts_sent" json:"initial_adverts_sent,omitempty"`
+	NAdvertisementsSent      uint32                         `binapi:"u32,name=n_advertisements_sent" json:"n_advertisements_sent,omitempty"`
+	NSolicitationsRcvd       uint32                         `binapi:"u32,name=n_solicitations_rcvd" json:"n_solicitations_rcvd,omitempty"`
+	NSolicitationsDropped    uint32                         `binapi:"u32,name=n_solicitations_dropped" json:"n_solicitations_dropped,omitempty"`
+	NPrefixes                uint32                         `binapi:"u32,name=n_prefixes" json:"-"`
+	Prefixes                 []IP6ndRaPrefix                `binapi:"ip6nd_ra_prefix[n_prefixes],name=prefixes" json:"prefixes,omitempty"`
+}
+
+func (m *SwInterfaceIP6ndRaDetails) Reset()               { *m = SwInterfaceIP6ndRaDetails{} }
+func (*SwInterfaceIP6ndRaDetails) GetMessageName() string { return "sw_interface_ip6nd_ra_details" }
+func (*SwInterfaceIP6ndRaDetails) GetCrcString() string   { return "d3198de5" }
+func (*SwInterfaceIP6ndRaDetails) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *SwInterfaceIP6ndRaDetails) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.SwIfIndex
+	size += 1 // m.CurHopLimit
+	size += 1 // m.AdvManagedFlag
+	size += 1 // m.AdvOtherFlag
+	size += 2 // m.AdvRouterLifetime
+	size += 4 // m.AdvNeighborReachableTime
+	size += 4 // m.AdvRetransmitInterval
+	size += 4 // m.AdvLinkMtu
+	size += 1 // m.SendRadv
+	size += 1 // m.CeaseRadv
+	size += 1 // m.SendUnicast
+	size += 1 // m.AdvLinkLayerAddress
+	size += 8 // m.MaxRadvInterval
+	size += 8 // m.MinRadvInterval
+	size += 8 // m.LastRadvTime
+	size += 8 // m.LastMulticastTime
+	size += 8 // m.NextMulticastTime
+	size += 4 // m.InitialAdvertsCount
+	size += 8 // m.InitialAdvertsInterval
+	size += 1 // m.InitialAdvertsSent
+	size += 4 // m.NAdvertisementsSent
+	size += 4 // m.NSolicitationsRcvd
+	size += 4 // m.NSolicitationsDropped
+	size += 4 // m.NPrefixes
+	for j1 := 0; j1 < len(m.Prefixes); j1++ {
+		var s1 IP6ndRaPrefix
+		_ = s1
+		if j1 < len(m.Prefixes) {
+			s1 = m.Prefixes[j1]
+		}
+		size += 1      // s1.Prefix.Address.Af
+		size += 1 * 16 // s1.Prefix.Address.Un
+		size += 1      // s1.Prefix.Len
+		size += 1      // s1.OnlinkFlag
+		size += 1      // s1.AutonomousFlag
+		size += 4      // s1.ValLifetime
+		size += 4      // s1.PrefLifetime
+		size += 8      // s1.ValidLifetimeExpires
+		size += 8      // s1.PrefLifetimeExpires
+		size += 1      // s1.DecrementLifetimeFlag
+		size += 1      // s1.NoAdvertise
+	}
+	return size
+}
+func (m *SwInterfaceIP6ndRaDetails) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(uint32(m.SwIfIndex))
+	buf.EncodeUint8(m.CurHopLimit)
+	buf.EncodeBool(m.AdvManagedFlag)
+	buf.EncodeBool(m.AdvOtherFlag)
+	buf.EncodeUint16(m.AdvRouterLifetime)
+	buf.EncodeUint32(m.AdvNeighborReachableTime)
+	buf.EncodeUint32(m.AdvRetransmitInterval)
+	buf.EncodeUint32(m.AdvLinkMtu)
+	buf.EncodeBool(m.SendRadv)
+	buf.EncodeBool(m.CeaseRadv)
+	buf.EncodeBool(m.SendUnicast)
+	buf.EncodeBool(m.AdvLinkLayerAddress)
+	buf.EncodeFloat64(m.MaxRadvInterval)
+	buf.EncodeFloat64(m.MinRadvInterval)
+	buf.EncodeFloat64(m.LastRadvTime)
+	buf.EncodeFloat64(m.LastMulticastTime)
+	buf.EncodeFloat64(m.NextMulticastTime)
+	buf.EncodeUint32(m.InitialAdvertsCount)
+	buf.EncodeFloat64(m.InitialAdvertsInterval)
+	buf.EncodeBool(m.InitialAdvertsSent)
+	buf.EncodeUint32(m.NAdvertisementsSent)
+	buf.EncodeUint32(m.NSolicitationsRcvd)
+	buf.EncodeUint32(m.NSolicitationsDropped)
+	buf.EncodeUint32(uint32(len(m.Prefixes)))
+	for j0 := 0; j0 < len(m.Prefixes); j0++ {
+		var v0 IP6ndRaPrefix // Prefixes
+		if j0 < len(m.Prefixes) {
+			v0 = m.Prefixes[j0]
+		}
+		buf.EncodeUint8(uint8(v0.Prefix.Address.Af))
+		buf.EncodeBytes(v0.Prefix.Address.Un.XXX_UnionData[:], 16)
+		buf.EncodeUint8(v0.Prefix.Len)
+		buf.EncodeBool(v0.OnlinkFlag)
+		buf.EncodeBool(v0.AutonomousFlag)
+		buf.EncodeUint32(v0.ValLifetime)
+		buf.EncodeUint32(v0.PrefLifetime)
+		buf.EncodeFloat64(v0.ValidLifetimeExpires)
+		buf.EncodeFloat64(v0.PrefLifetimeExpires)
+		buf.EncodeBool(v0.DecrementLifetimeFlag)
+		buf.EncodeBool(v0.NoAdvertise)
+	}
+	return buf.Bytes(), nil
+}
+func (m *SwInterfaceIP6ndRaDetails) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+	m.CurHopLimit = buf.DecodeUint8()
+	m.AdvManagedFlag = buf.DecodeBool()
+	m.AdvOtherFlag = buf.DecodeBool()
+	m.AdvRouterLifetime = buf.DecodeUint16()
+	m.AdvNeighborReachableTime = buf.DecodeUint32()
+	m.AdvRetransmitInterval = buf.DecodeUint32()
+	m.AdvLinkMtu = buf.DecodeUint32()
+	m.SendRadv = buf.DecodeBool()
+	m.CeaseRadv = buf.DecodeBool()
+	m.SendUnicast = buf.DecodeBool()
+	m.AdvLinkLayerAddress = buf.DecodeBool()
+	m.MaxRadvInterval = buf.DecodeFloat64()
+	m.MinRadvInterval = buf.DecodeFloat64()
+	m.LastRadvTime = buf.DecodeFloat64()
+	m.LastMulticastTime = buf.DecodeFloat64()
+	m.NextMulticastTime = buf.DecodeFloat64()
+	m.InitialAdvertsCount = buf.DecodeUint32()
+	m.InitialAdvertsInterval = buf.DecodeFloat64()
+	m.InitialAdvertsSent = buf.DecodeBool()
+	m.NAdvertisementsSent = buf.DecodeUint32()
+	m.NSolicitationsRcvd = buf.DecodeUint32()
+	m.NSolicitationsDropped = buf.DecodeUint32()
+	m.NPrefixes = buf.DecodeUint32()
+	m.Prefixes = make([]IP6ndRaPrefix, m.NPrefixes)
+	for j0 := 0; j0 < len(m.Prefixes); j0++ {
+		m.Prefixes[j0].Prefix.Address.Af = ip_types.AddressFamily(buf.DecodeUint8())
+		copy(m.Prefixes[j0].Prefix.Address.Un.XXX_UnionData[:], buf.DecodeBytes(16))
+		m.Prefixes[j0].Prefix.Len = buf.DecodeUint8()
+		m.Prefixes[j0].OnlinkFlag = buf.DecodeBool()
+		m.Prefixes[j0].AutonomousFlag = buf.DecodeBool()
+		m.Prefixes[j0].ValLifetime = buf.DecodeUint32()
+		m.Prefixes[j0].PrefLifetime = buf.DecodeUint32()
+		m.Prefixes[j0].ValidLifetimeExpires = buf.DecodeFloat64()
+		m.Prefixes[j0].PrefLifetimeExpires = buf.DecodeFloat64()
+		m.Prefixes[j0].DecrementLifetimeFlag = buf.DecodeBool()
+		m.Prefixes[j0].NoAdvertise = buf.DecodeBool()
+	}
+	return nil
+}
+
+// Dump IPv6 Router Advertisements details on a per-interface basis
+//   - sw_if_index - interface index to use as a filter (0xffffffff
+//     represents all interfaces)
+//
+// SwInterfaceIP6ndRaDump defines message 'sw_interface_ip6nd_ra_dump'.
+// InProgress: the message form may change in the future versions
+type SwInterfaceIP6ndRaDump struct {
+	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
+}
+
+func (m *SwInterfaceIP6ndRaDump) Reset()               { *m = SwInterfaceIP6ndRaDump{} }
+func (*SwInterfaceIP6ndRaDump) GetMessageName() string { return "sw_interface_ip6nd_ra_dump" }
+func (*SwInterfaceIP6ndRaDump) GetCrcString() string   { return "f9e6675e" }
+func (*SwInterfaceIP6ndRaDump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *SwInterfaceIP6ndRaDump) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.SwIfIndex
+	return size
+}
+func (m *SwInterfaceIP6ndRaDump) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeUint32(uint32(m.SwIfIndex))
+	return buf.Bytes(), nil
+}
+func (m *SwInterfaceIP6ndRaDump) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32())
+	return nil
+}
+
 // IPv6 router advertisement prefix config request
 //   - sw_if_index - The interface the RA prefix information is for
 //   - prefix - The prefix to advertise
@@ -826,6 +1100,8 @@ func file_ip6_nd_binapi_init() {
 	api.RegisterMessage((*IP6ndSendRouterSolicitationReply)(nil), "ip6nd_send_router_solicitation_reply_e8d4e804")
 	api.RegisterMessage((*SwInterfaceIP6ndRaConfig)(nil), "sw_interface_ip6nd_ra_config_3eb00b1c")
 	api.RegisterMessage((*SwInterfaceIP6ndRaConfigReply)(nil), "sw_interface_ip6nd_ra_config_reply_e8d4e804")
+	api.RegisterMessage((*SwInterfaceIP6ndRaDetails)(nil), "sw_interface_ip6nd_ra_details_d3198de5")
+	api.RegisterMessage((*SwInterfaceIP6ndRaDump)(nil), "sw_interface_ip6nd_ra_dump_f9e6675e")
 	api.RegisterMessage((*SwInterfaceIP6ndRaPrefix)(nil), "sw_interface_ip6nd_ra_prefix_82cc1b28")
 	api.RegisterMessage((*SwInterfaceIP6ndRaPrefixReply)(nil), "sw_interface_ip6nd_ra_prefix_reply_e8d4e804")
 	api.RegisterMessage((*WantIP6RaEvents)(nil), "want_ip6_ra_events_3ec6d6c2")
@@ -846,6 +1122,8 @@ func AllMessages() []api.Message {
 		(*IP6ndSendRouterSolicitationReply)(nil),
 		(*SwInterfaceIP6ndRaConfig)(nil),
 		(*SwInterfaceIP6ndRaConfigReply)(nil),
+		(*SwInterfaceIP6ndRaDetails)(nil),
+		(*SwInterfaceIP6ndRaDump)(nil),
 		(*SwInterfaceIP6ndRaPrefix)(nil),
 		(*SwInterfaceIP6ndRaPrefixReply)(nil),
 		(*WantIP6RaEvents)(nil),
diff --git a/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go b/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go
index ee6fc885..8d893a8a 100644
--- a/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go
+++ b/vpplink/generated/bindings/ip6_nd/ip6_nd_rpc.ba.go
@@ -18,6 +18,7 @@ type RPCService interface {
 	IP6ndProxyEnableDisable(ctx context.Context, in *IP6ndProxyEnableDisable) (*IP6ndProxyEnableDisableReply, error)
 	IP6ndSendRouterSolicitation(ctx context.Context, in *IP6ndSendRouterSolicitation) (*IP6ndSendRouterSolicitationReply, error)
 	SwInterfaceIP6ndRaConfig(ctx context.Context, in *SwInterfaceIP6ndRaConfig) (*SwInterfaceIP6ndRaConfigReply, error)
+	SwInterfaceIP6ndRaDump(ctx context.Context, in *SwInterfaceIP6ndRaDump) (RPCService_SwInterfaceIP6ndRaDumpClient, error)
 	SwInterfaceIP6ndRaPrefix(ctx context.Context, in *SwInterfaceIP6ndRaPrefix) (*SwInterfaceIP6ndRaPrefixReply, error)
 	WantIP6RaEvents(ctx context.Context, in *WantIP6RaEvents) (*WantIP6RaEventsReply, error)
 }
@@ -109,6 +110,49 @@ func (c *serviceClient) SwInterfaceIP6ndRaConfig(ctx context.Context, in *SwInte
 	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
+func (c *serviceClient) SwInterfaceIP6ndRaDump(ctx context.Context, in *SwInterfaceIP6ndRaDump) (RPCService_SwInterfaceIP6ndRaDumpClient, error) {
+	stream, err := c.conn.NewStream(ctx)
+	if err != nil {
+		return nil, err
+	}
+	x := &serviceClient_SwInterfaceIP6ndRaDumpClient{stream}
+	if err := x.Stream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type RPCService_SwInterfaceIP6ndRaDumpClient interface {
+	Recv() (*SwInterfaceIP6ndRaDetails, error)
+	api.Stream
+}
+
+type serviceClient_SwInterfaceIP6ndRaDumpClient struct {
+	api.Stream
+}
+
+func (c *serviceClient_SwInterfaceIP6ndRaDumpClient) Recv() (*SwInterfaceIP6ndRaDetails, error) {
+	msg, err := c.Stream.RecvMsg()
+	if err != nil {
+		return nil, err
+	}
+	switch m := msg.(type) {
+	case *SwInterfaceIP6ndRaDetails:
+		return m, nil
+	case *memclnt.ControlPingReply:
+		err = c.Stream.Close()
+		if err != nil {
+			return nil, err
+		}
+		return nil, io.EOF
+	default:
+		return nil, fmt.Errorf("unexpected message: %T %v", m, m)
+	}
+}
+
 func (c *serviceClient) SwInterfaceIP6ndRaPrefix(ctx context.Context, in *SwInterfaceIP6ndRaPrefix) (*SwInterfaceIP6ndRaPrefixReply, error) {
 	out := new(SwInterfaceIP6ndRaPrefixReply)
 	err := c.conn.Invoke(ctx, in, out)
diff --git a/vpplink/generated/bindings/ipip/ipip.ba.go b/vpplink/generated/bindings/ipip/ipip.ba.go
index 21748ce6..d879ff80 100644
--- a/vpplink/generated/bindings/ipip/ipip.ba.go
+++ b/vpplink/generated/bindings/ipip/ipip.ba.go
@@ -103,7 +103,6 @@ func (m *Ipip6rdAddTunnel) Unmarshal(b []byte) error {
 	return nil
 }
 
-// * Create an IPv4 over IPv6 automatic tunnel (6RD)
 // Ipip6rdAddTunnelReply defines message 'ipip_6rd_add_tunnel_reply'.
 type Ipip6rdAddTunnelReply struct {
 	Retval    int32                          `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -269,7 +268,6 @@ func (m *IpipAddTunnel) Unmarshal(b []byte) error {
 	return nil
 }
 
-// * Create an IP{v4,v6} over IP{v4,v6} tunnel.
 // IpipAddTunnelReply defines message 'ipip_add_tunnel_reply'.
 type IpipAddTunnelReply struct {
 	Retval    int32                          `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -374,7 +372,6 @@ func (m *IpipDelTunnelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// * List all IPIP tunnels
 // IpipTunnelDetails defines message 'ipip_tunnel_details'.
 type IpipTunnelDetails struct {
 	Tunnel IpipTunnel `binapi:"ipip_tunnel,name=tunnel" json:"tunnel,omitempty"`
diff --git a/vpplink/generated/bindings/ipsec/ipsec.ba.go b/vpplink/generated/bindings/ipsec/ipsec.ba.go
index 7e429eef..90e847b0 100644
--- a/vpplink/generated/bindings/ipsec/ipsec.ba.go
+++ b/vpplink/generated/bindings/ipsec/ipsec.ba.go
@@ -285,10 +285,6 @@ func (m *IpsecItfCreateReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IPsec interface interface response
-//   - retval - return status
-//   - sw_if_index - sw_if_index of new interface (for successful add)
-//
 // IpsecItfDelete defines message 'ipsec_itf_delete'.
 type IpsecItfDelete struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -355,10 +351,6 @@ func (m *IpsecItfDeleteReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IPsec interface interface response
-//   - retval - return status
-//   - sw_if_index - sw_if_index of new interface (for successful add)
-//
 // IpsecItfDetails defines message 'ipsec_itf_details'.
 type IpsecItfDetails struct {
 	Itf IpsecItf `binapi:"ipsec_itf,name=itf" json:"itf,omitempty"`
@@ -398,10 +390,6 @@ func (m *IpsecItfDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add IPsec interface interface response
-//   - retval - return status
-//   - sw_if_index - sw_if_index of new interface (for successful add)
-//
 // IpsecItfDump defines message 'ipsec_itf_dump'.
 type IpsecItfDump struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -594,17 +582,6 @@ func (m *IpsecSaDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IPsec security association database response
-//   - entry - The SA details
-//   - sw_if_index - sw_if_index of tunnel interface, policy-based SAs = ~0
-//   - salt - 4 byte salt
-//   - seq - current sequence number for outbound
-//   - seq_hi - high 32 bits of ESN for outbound
-//   - last_seq - highest sequence number received inbound
-//   - last_seq_hi - high 32 bits of highest ESN received inbound
-//   - replay_window - bit map of seq nums received relative to last_seq if using anti-replay
-//   - stat_index - index for the SA in the stats segment @ /net/ipsec/sa
-//
 // IpsecSaV2Details defines message 'ipsec_sa_v2_details'.
 type IpsecSaV2Details struct {
 	Entry          ipsec_types.IpsecSadEntryV2    `binapi:"ipsec_sad_entry_v2,name=entry" json:"entry,omitempty"`
@@ -721,9 +698,6 @@ func (m *IpsecSaV2Details) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IPsec security association
-//   - sa_id - optional ID of an SA to dump, if ~0 dump all SAs in SAD
-//
 // IpsecSaV2Dump defines message 'ipsec_sa_v2_dump'.
 type IpsecSaV2Dump struct {
 	SaID uint32 `binapi:"u32,name=sa_id" json:"sa_id,omitempty"`
@@ -757,17 +731,6 @@ func (m *IpsecSaV2Dump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IPsec security association database response
-//   - entry - The SA details
-//   - sw_if_index - sw_if_index of tunnel interface, policy-based SAs = ~0
-//   - salt - 4 byte salt
-//   - seq - current sequence number for outbound
-//   - seq_hi - high 32 bits of ESN for outbound
-//   - last_seq - highest sequence number received inbound
-//   - last_seq_hi - high 32 bits of highest ESN received inbound
-//   - replay_window - bit map of seq nums received relative to last_seq if using anti-replay
-//   - stat_index - index for the SA in the stats segment @ /net/ipsec/sa
-//
 // IpsecSaV3Details defines message 'ipsec_sa_v3_details'.
 type IpsecSaV3Details struct {
 	Entry          ipsec_types.IpsecSadEntryV3    `binapi:"ipsec_sad_entry_v3,name=entry" json:"entry,omitempty"`
@@ -895,9 +858,6 @@ func (m *IpsecSaV3Details) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump IPsec security association
-//   - sa_id - optional ID of an SA to dump, if ~0 dump all SAs in SAD
-//
 // IpsecSaV3Dump defines message 'ipsec_sa_v3_dump'.
 type IpsecSaV3Dump struct {
 	SaID uint32 `binapi:"u32,name=sa_id" json:"sa_id,omitempty"`
@@ -931,9 +891,6 @@ func (m *IpsecSaV3Dump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IPsec: Add/delete Security Association Database entry
-//   - entry - Entry to add or delete
-//
 // IpsecSadEntryAdd defines message 'ipsec_sad_entry_add'.
 type IpsecSadEntryAdd struct {
 	Entry ipsec_types.IpsecSadEntryV3 `binapi:"ipsec_sad_entry_v3,name=entry" json:"entry,omitempty"`
@@ -1135,15 +1092,6 @@ func (m *IpsecSadEntryAddDel) Unmarshal(b []byte) error {
 	return nil
 }
 
-// An API to update the tunnel parameters and the ports associated with an SA
-//
-//	Used in the NAT-T case when the NAT data changes
-//	- sa_id - the id of the SA to update
-//	- is_tun - update the tunnel if non-zero, else update only the ports
-//	- tunnel - sender context, to match reply w/ request
-//	- udp_src_port - new src port for NAT-T. Used if different from 0xffff
-//	- udp_dst_port - new dst port for NAT-T. Used if different from 0xffff
-//
 // IpsecSadEntryAddDelReply defines message 'ipsec_sad_entry_add_del_reply'.
 // Deprecated: the message will be removed in the future versions
 type IpsecSadEntryAddDelReply struct {
@@ -1182,9 +1130,6 @@ func (m *IpsecSadEntryAddDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IPsec: Add/delete Security Association Database entry
-//   - entry - Entry to add or delete
-//
 // IpsecSadEntryAddDelV2 defines message 'ipsec_sad_entry_add_del_v2'.
 type IpsecSadEntryAddDelV2 struct {
 	IsAdd bool                        `binapi:"bool,name=is_add" json:"is_add,omitempty"`
@@ -1281,15 +1226,6 @@ func (m *IpsecSadEntryAddDelV2) Unmarshal(b []byte) error {
 	return nil
 }
 
-// An API to update the tunnel parameters and the ports associated with an SA
-//
-//	Used in the NAT-T case when the NAT data changes
-//	- sa_id - the id of the SA to update
-//	- is_tun - update the tunnel if non-zero, else update only the ports
-//	- tunnel - sender context, to match reply w/ request
-//	- udp_src_port - new src port for NAT-T. Used if different from 0xffff
-//	- udp_dst_port - new dst port for NAT-T. Used if different from 0xffff
-//
 // IpsecSadEntryAddDelV2Reply defines message 'ipsec_sad_entry_add_del_v2_reply'.
 type IpsecSadEntryAddDelV2Reply struct {
 	Retval    int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -1327,9 +1263,6 @@ func (m *IpsecSadEntryAddDelV2Reply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IPsec: Add/delete Security Association Database entry
-//   - entry - Entry to add or delete
-//
 // IpsecSadEntryAddDelV3 defines message 'ipsec_sad_entry_add_del_v3'.
 type IpsecSadEntryAddDelV3 struct {
 	IsAdd bool                        `binapi:"bool,name=is_add" json:"is_add,omitempty"`
@@ -1441,15 +1374,6 @@ func (m *IpsecSadEntryAddDelV3) Unmarshal(b []byte) error {
 	return nil
 }
 
-// An API to update the tunnel parameters and the ports associated with an SA
-//
-//	Used in the NAT-T case when the NAT data changes
-//	- sa_id - the id of the SA to update
-//	- is_tun - update the tunnel if non-zero, else update only the ports
-//	- tunnel - sender context, to match reply w/ request
-//	- udp_src_port - new src port for NAT-T. Used if different from 0xffff
-//	- udp_dst_port - new dst port for NAT-T. Used if different from 0xffff
-//
 // IpsecSadEntryAddDelV3Reply defines message 'ipsec_sad_entry_add_del_v3_reply'.
 type IpsecSadEntryAddDelV3Reply struct {
 	Retval    int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -1487,15 +1411,6 @@ func (m *IpsecSadEntryAddDelV3Reply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// An API to update the tunnel parameters and the ports associated with an SA
-//
-//	Used in the NAT-T case when the NAT data changes
-//	- sa_id - the id of the SA to update
-//	- is_tun - update the tunnel if non-zero, else update only the ports
-//	- tunnel - sender context, to match reply w/ request
-//	- udp_src_port - new src port for NAT-T. Used if different from 0xffff
-//	- udp_dst_port - new dst port for NAT-T. Used if different from 0xffff
-//
 // IpsecSadEntryAddReply defines message 'ipsec_sad_entry_add_reply'.
 type IpsecSadEntryAddReply struct {
 	Retval    int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -1533,9 +1448,6 @@ func (m *IpsecSadEntryAddReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// IPsec: Add/delete Security Association Database entry
-//   - entry - Entry to add or delete
-//
 // IpsecSadEntryDel defines message 'ipsec_sad_entry_del'.
 type IpsecSadEntryDel struct {
 	ID uint32 `binapi:"u32,name=id" json:"id,omitempty"`
@@ -2494,43 +2406,6 @@ func (m *IpsecSpdsDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add or Update Protection for a tunnel with IPSEC
-//
-//	Tunnel protection directly associates an SA with all packets
-//	ingress and egress on the tunnel. This could also be achieved by
-//	assigning an SPD to the tunnel, but that would incur an unnessccary
-//	SPD entry lookup.
-//	For tunnels the ESP acts on the post-encapsulated packet. So if this
-//	packet:
-//	  +---------+------+
-//	  | Payload | O-IP |
-//	  +---------+------+
-//	where O-IP is the overlay IP addrees that was routed into the tunnel,
-//	the resulting encapsulated packet will be:
-//	  +---------+------+------+
-//	  | Payload | O-IP | T-IP |
-//	  +---------+------+------+
-//	where T-IP is the tunnel's src.dst IP addresses.
-//	If the SAs used for protection are in transport mode then the ESP is
-//	inserted before T-IP, i.e.:
-//	  +---------+------+-----+------+
-//	  | Payload | O-IP | ESP | T-IP |
-//	  +---------+------+-----+------+
-//	If the SAs used for protection are in tunnel mode then another
-//	encapsulation occurs, i.e.:
-//	  +---------+------+------+-----+------+
-//	  | Payload | O-IP | T-IP | ESP | C-IP |
-//	  +---------+------+------+-----+------+
-//	where C-IP are the crypto endpoint IP addresses defined as the tunnel
-//	endpoints in the SA.
-//	The mode for the inbound and outbound SA must be the same.
-//	- sw_id_index - Tunnel interface to protect
-//	- nh - The peer/next-hop on the tunnel to which the traffic
-//	            should be protected. For a P2P interface set this to the
-//	            all 0s address.
-//	- sa_in - The ID [set] of inbound SAs
-//	- sa_out - The ID of outbound SA
-//
 // IpsecTunnelProtectDel defines message 'ipsec_tunnel_protect_del'.
 type IpsecTunnelProtectDel struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -2604,7 +2479,6 @@ func (m *IpsecTunnelProtectDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// * @brief Dump all tunnel protections
 // IpsecTunnelProtectDetails defines message 'ipsec_tunnel_protect_details'.
 type IpsecTunnelProtectDetails struct {
 	Tun IpsecTunnelProtect `binapi:"ipsec_tunnel_protect,name=tun" json:"tun,omitempty"`
diff --git a/vpplink/generated/bindings/memclnt/memclnt.ba.go b/vpplink/generated/bindings/memclnt/memclnt.ba.go
index 6ba7c4f8..87f47553 100644
--- a/vpplink/generated/bindings/memclnt/memclnt.ba.go
+++ b/vpplink/generated/bindings/memclnt/memclnt.ba.go
@@ -68,9 +68,6 @@ func (m *APIVersions) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /*
-//   - Get API version table (includes built-in and plugins)
-//
 // APIVersionsReply defines message 'api_versions_reply'.
 type APIVersionsReply struct {
 	Retval      int32           `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -246,9 +243,6 @@ func (m *GetFirstMsgID) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /*
-//   - Lookup message-ID base by name
-//
 // GetFirstMsgIDReply defines message 'get_first_msg_id_reply'.
 type GetFirstMsgIDReply struct {
 	Retval     int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -343,9 +337,6 @@ func (m *MemclntCreate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /*
-//   - Create a client registration
-//
 // MemclntCreateReply defines message 'memclnt_create_reply'.
 type MemclntCreateReply struct {
 	Response     int32  `binapi:"i32,name=response" json:"response,omitempty"`
@@ -391,10 +382,6 @@ func (m *MemclntCreateReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Control ping from the client to the server response
-//   - retval - return code for the request
-//   - vpe_pid - the pid of the vpe, returned by the server
-//
 // MemclntCreateV2 defines message 'memclnt_create_v2'.
 type MemclntCreateV2 struct {
 	CtxQuota    int32    `binapi:"i32,name=ctx_quota" json:"ctx_quota,omitempty"`
@@ -453,10 +440,6 @@ func (m *MemclntCreateV2) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Control ping from the client to the server response
-//   - retval - return code for the request
-//   - vpe_pid - the pid of the vpe, returned by the server
-//
 // MemclntCreateV2Reply defines message 'memclnt_create_v2_reply'.
 type MemclntCreateV2Reply struct {
 	Response     int32  `binapi:"i32,name=response" json:"response,omitempty"`
@@ -546,9 +529,6 @@ func (m *MemclntDelete) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /*
-//   - Delete a client registration
-//
 // MemclntDeleteReply defines message 'memclnt_delete_reply'.
 type MemclntDeleteReply struct {
 	Response int32  `binapi:"i32,name=response" json:"response,omitempty"`
@@ -970,9 +950,6 @@ func (m *SockclntCreate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /*
-//   - Create a socket client registration.
-//
 // SockclntCreateReply defines message 'sockclnt_create_reply'.
 type SockclntCreateReply struct {
 	Response     int32               `binapi:"i32,name=response" json:"response,omitempty"`
@@ -1073,9 +1050,6 @@ func (m *SockclntDelete) Unmarshal(b []byte) error {
 	return nil
 }
 
-// /*
-//   - Delete a client registration
-//
 // SockclntDeleteReply defines message 'sockclnt_delete_reply'.
 type SockclntDeleteReply struct {
 	Response int32 `binapi:"i32,name=response" json:"response,omitempty"`
diff --git a/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go b/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go
index 287e701b..febe7ef5 100644
--- a/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go
+++ b/vpplink/generated/bindings/nat44_ed/nat44_ed.ba.go
@@ -1180,12 +1180,6 @@ func (m *Nat44EdAddDelVrfTableReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// add/del NAT output interface (postrouting
-//
-//	       in2out translation)
-//	- is_add - true if add, false if delete
-//	- sw_if_index - software index of the interface
-//
 // Nat44EdOutputInterfaceDetails defines message 'nat44_ed_output_interface_details'.
 type Nat44EdOutputInterfaceDetails struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -1221,12 +1215,6 @@ func (m *Nat44EdOutputInterfaceDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// add/del NAT output interface (postrouting
-//
-//	       in2out translation)
-//	- is_add - true if add, false if delete
-//	- sw_if_index - software index of the interface
-//
 // Nat44EdOutputInterfaceGet defines message 'nat44_ed_output_interface_get'.
 type Nat44EdOutputInterfaceGet struct {
 	Cursor uint32 `binapi:"u32,name=cursor" json:"cursor,omitempty"`
@@ -1260,12 +1248,6 @@ func (m *Nat44EdOutputInterfaceGet) Unmarshal(b []byte) error {
 	return nil
 }
 
-// add/del NAT output interface (postrouting
-//
-//	       in2out translation)
-//	- is_add - true if add, false if delete
-//	- sw_if_index - software index of the interface
-//
 // Nat44EdOutputInterfaceGetReply defines message 'nat44_ed_output_interface_get_reply'.
 type Nat44EdOutputInterfaceGetReply struct {
 	Retval int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
diff --git a/vpplink/generated/bindings/pbl/pbl.ba.go b/vpplink/generated/bindings/pbl/pbl.ba.go
index 408007a7..ae837102 100644
--- a/vpplink/generated/bindings/pbl/pbl.ba.go
+++ b/vpplink/generated/bindings/pbl/pbl.ba.go
@@ -91,11 +91,6 @@ type PblPortRange struct {
 	Iproto ip_types.IPProto `binapi:"ip_proto,name=iproto" json:"iproto,omitempty"`
 }
 
-// \file
-//
-//	This file defines the vpp control-plane API messages
-//	used to control the PBL plugin
-//
 // PblClientDel defines message 'pbl_client_del'.
 // InProgress: the message form may change in the future versions
 type PblClientDel struct {
@@ -164,11 +159,6 @@ func (m *PblClientDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// \file
-//
-//	This file defines the vpp control-plane API messages
-//	used to control the PBL plugin
-//
 // PblClientDetails defines message 'pbl_client_details'.
 // InProgress: the message form may change in the future versions
 type PblClientDetails struct {
@@ -300,11 +290,6 @@ func (m *PblClientDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// \file
-//
-//	This file defines the vpp control-plane API messages
-//	used to control the PBL plugin
-//
 // PblClientDump defines message 'pbl_client_dump'.
 // InProgress: the message form may change in the future versions
 type PblClientDump struct{}
@@ -469,11 +454,6 @@ func (m *PblClientUpdate) Unmarshal(b []byte) error {
 	return nil
 }
 
-// \file
-//
-//	This file defines the vpp control-plane API messages
-//	used to control the PBL plugin
-//
 // PblClientUpdateReply defines message 'pbl_client_update_reply'.
 // InProgress: the message form may change in the future versions
 type PblClientUpdateReply struct {
diff --git a/vpplink/generated/bindings/punt/punt.ba.go b/vpplink/generated/bindings/punt/punt.ba.go
index 227ddcb4..4c2ca2ef 100644
--- a/vpplink/generated/bindings/punt/punt.ba.go
+++ b/vpplink/generated/bindings/punt/punt.ba.go
@@ -146,9 +146,6 @@ func (u *PuntUnion) GetIPProto() (a PuntIPProto) {
 	return
 }
 
-// Dump all or one of the exception punt reasons
-// *   - - If the string is not set punt dump all reasons
-// *            else dump only the one specified
 // PuntReasonDetails defines message 'punt_reason_details'.
 type PuntReasonDetails struct {
 	Reason PuntReason `binapi:"punt_reason,name=reason" json:"reason,omitempty"`
@@ -224,10 +221,6 @@ func (m *PuntReasonDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Punt traffic to the host via socket
-//   - header_version - expected meta data header version (currently 1)
-//   - punt - punt definition
-//
 // PuntSocketDeregister defines message 'punt_socket_deregister'.
 type PuntSocketDeregister struct {
 	Punt Punt `binapi:"punt,name=punt" json:"punt,omitempty"`
@@ -297,10 +290,6 @@ func (m *PuntSocketDeregisterReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Punt traffic to the host via socket
-//   - header_version - expected meta data header version (currently 1)
-//   - punt - punt definition
-//
 // PuntSocketDetails defines message 'punt_socket_details'.
 type PuntSocketDetails struct {
 	Punt     Punt   `binapi:"punt,name=punt" json:"punt,omitempty"`
@@ -341,10 +330,6 @@ func (m *PuntSocketDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Punt traffic to the host via socket
-//   - header_version - expected meta data header version (currently 1)
-//   - punt - punt definition
-//
 // PuntSocketDump defines message 'punt_socket_dump'.
 type PuntSocketDump struct {
 	Type PuntType `binapi:"punt_type,name=type" json:"type,omitempty"`
@@ -426,10 +411,6 @@ func (m *PuntSocketRegister) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Punt traffic to the host via socket
-//   - header_version - expected meta data header version (currently 1)
-//   - punt - punt definition
-//
 // PuntSocketRegisterReply defines message 'punt_socket_register_reply'.
 type PuntSocketRegisterReply struct {
 	Retval   int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
diff --git a/vpplink/generated/bindings/session/session.ba.go b/vpplink/generated/bindings/session/session.ba.go
index d523654a..dd2aea77 100644
--- a/vpplink/generated/bindings/session/session.ba.go
+++ b/vpplink/generated/bindings/session/session.ba.go
@@ -4,7 +4,7 @@
 //
 // Contents:
 // -  2 enums
-// - 28 messages
+// - 24 messages
 package session
 
 import (
@@ -25,7 +25,7 @@ const _ = api.GoVppAPIPackageIsVersion2
 const (
 	APIFile    = "session"
 	APIVersion = "4.0.0"
-	VersionCrc = 0x72bfc653
+	VersionCrc = 0xa92d704c
 )
 
 // SessionRuleScope defines enum 'session_rule_scope'.
@@ -671,10 +671,6 @@ func (m *AppNamespaceAddDelV3) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Reply for app namespace add/del
-//   - retval - return code
-//   - appns_index - app namespace index
-//
 // AppNamespaceAddDelV3Reply defines message 'app_namespace_add_del_v3_reply'.
 type AppNamespaceAddDelV3Reply struct {
 	Retval     int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -893,172 +889,6 @@ func (m *ApplicationDetachReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Application add TLS certificate
-//
-//		### WILL BE DEPRECATED POST 20.01 ###
-//	   - cert_len - certificate length
-//	   - cert - certificate as a string
-//
-// ApplicationTLSCertAdd defines message 'application_tls_cert_add'.
-// Deprecated: to be removed post 21.06
-type ApplicationTLSCertAdd struct {
-	AppIndex uint32 `binapi:"u32,name=app_index" json:"app_index,omitempty"`
-	CertLen  uint16 `binapi:"u16,name=cert_len" json:"-"`
-	Cert     []byte `binapi:"u8[cert_len],name=cert" json:"cert,omitempty"`
-}
-
-func (m *ApplicationTLSCertAdd) Reset()               { *m = ApplicationTLSCertAdd{} }
-func (*ApplicationTLSCertAdd) GetMessageName() string { return "application_tls_cert_add" }
-func (*ApplicationTLSCertAdd) GetCrcString() string   { return "3f5cfe45" }
-func (*ApplicationTLSCertAdd) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
-
-func (m *ApplicationTLSCertAdd) Size() (size int) {
-	if m == nil {
-		return 0
-	}
-	size += 4               // m.AppIndex
-	size += 2               // m.CertLen
-	size += 1 * len(m.Cert) // m.Cert
-	return size
-}
-func (m *ApplicationTLSCertAdd) Marshal(b []byte) ([]byte, error) {
-	if b == nil {
-		b = make([]byte, m.Size())
-	}
-	buf := codec.NewBuffer(b)
-	buf.EncodeUint32(m.AppIndex)
-	buf.EncodeUint16(uint16(len(m.Cert)))
-	buf.EncodeBytes(m.Cert, 0)
-	return buf.Bytes(), nil
-}
-func (m *ApplicationTLSCertAdd) Unmarshal(b []byte) error {
-	buf := codec.NewBuffer(b)
-	m.AppIndex = buf.DecodeUint32()
-	m.CertLen = buf.DecodeUint16()
-	m.Cert = make([]byte, m.CertLen)
-	copy(m.Cert, buf.DecodeBytes(len(m.Cert)))
-	return nil
-}
-
-// ApplicationTLSCertAddReply defines message 'application_tls_cert_add_reply'.
-// Deprecated: to be removed post 21.06
-type ApplicationTLSCertAddReply struct {
-	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
-}
-
-func (m *ApplicationTLSCertAddReply) Reset()               { *m = ApplicationTLSCertAddReply{} }
-func (*ApplicationTLSCertAddReply) GetMessageName() string { return "application_tls_cert_add_reply" }
-func (*ApplicationTLSCertAddReply) GetCrcString() string   { return "e8d4e804" }
-func (*ApplicationTLSCertAddReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
-
-func (m *ApplicationTLSCertAddReply) Size() (size int) {
-	if m == nil {
-		return 0
-	}
-	size += 4 // m.Retval
-	return size
-}
-func (m *ApplicationTLSCertAddReply) Marshal(b []byte) ([]byte, error) {
-	if b == nil {
-		b = make([]byte, m.Size())
-	}
-	buf := codec.NewBuffer(b)
-	buf.EncodeInt32(m.Retval)
-	return buf.Bytes(), nil
-}
-func (m *ApplicationTLSCertAddReply) Unmarshal(b []byte) error {
-	buf := codec.NewBuffer(b)
-	m.Retval = buf.DecodeInt32()
-	return nil
-}
-
-// Application add TLS key
-//
-//		### WILL BE DEPRECATED POST 20.01 ###
-//	   - key_len - certificate length
-//	   - key - PEM encoded key as a string
-//
-// ApplicationTLSKeyAdd defines message 'application_tls_key_add'.
-// Deprecated: to be removed post 21.06
-type ApplicationTLSKeyAdd struct {
-	AppIndex uint32 `binapi:"u32,name=app_index" json:"app_index,omitempty"`
-	KeyLen   uint16 `binapi:"u16,name=key_len" json:"-"`
-	Key      []byte `binapi:"u8[key_len],name=key" json:"key,omitempty"`
-}
-
-func (m *ApplicationTLSKeyAdd) Reset()               { *m = ApplicationTLSKeyAdd{} }
-func (*ApplicationTLSKeyAdd) GetMessageName() string { return "application_tls_key_add" }
-func (*ApplicationTLSKeyAdd) GetCrcString() string   { return "5eaf70cd" }
-func (*ApplicationTLSKeyAdd) GetMessageType() api.MessageType {
-	return api.RequestMessage
-}
-
-func (m *ApplicationTLSKeyAdd) Size() (size int) {
-	if m == nil {
-		return 0
-	}
-	size += 4              // m.AppIndex
-	size += 2              // m.KeyLen
-	size += 1 * len(m.Key) // m.Key
-	return size
-}
-func (m *ApplicationTLSKeyAdd) Marshal(b []byte) ([]byte, error) {
-	if b == nil {
-		b = make([]byte, m.Size())
-	}
-	buf := codec.NewBuffer(b)
-	buf.EncodeUint32(m.AppIndex)
-	buf.EncodeUint16(uint16(len(m.Key)))
-	buf.EncodeBytes(m.Key, 0)
-	return buf.Bytes(), nil
-}
-func (m *ApplicationTLSKeyAdd) Unmarshal(b []byte) error {
-	buf := codec.NewBuffer(b)
-	m.AppIndex = buf.DecodeUint32()
-	m.KeyLen = buf.DecodeUint16()
-	m.Key = make([]byte, m.KeyLen)
-	copy(m.Key, buf.DecodeBytes(len(m.Key)))
-	return nil
-}
-
-// ApplicationTLSKeyAddReply defines message 'application_tls_key_add_reply'.
-// Deprecated: to be removed post 21.06
-type ApplicationTLSKeyAddReply struct {
-	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
-}
-
-func (m *ApplicationTLSKeyAddReply) Reset()               { *m = ApplicationTLSKeyAddReply{} }
-func (*ApplicationTLSKeyAddReply) GetMessageName() string { return "application_tls_key_add_reply" }
-func (*ApplicationTLSKeyAddReply) GetCrcString() string   { return "e8d4e804" }
-func (*ApplicationTLSKeyAddReply) GetMessageType() api.MessageType {
-	return api.ReplyMessage
-}
-
-func (m *ApplicationTLSKeyAddReply) Size() (size int) {
-	if m == nil {
-		return 0
-	}
-	size += 4 // m.Retval
-	return size
-}
-func (m *ApplicationTLSKeyAddReply) Marshal(b []byte) ([]byte, error) {
-	if b == nil {
-		b = make([]byte, m.Size())
-	}
-	buf := codec.NewBuffer(b)
-	buf.EncodeInt32(m.Retval)
-	return buf.Bytes(), nil
-}
-func (m *ApplicationTLSKeyAddReply) Unmarshal(b []byte) error {
-	buf := codec.NewBuffer(b)
-	m.Retval = buf.DecodeInt32()
-	return nil
-}
-
 // enable/disable session layer
 //
 //	                      client to vpp direction only
@@ -1475,10 +1305,6 @@ func file_session_binapi_init() {
 	api.RegisterMessage((*AppWorkerAddDelReply)(nil), "app_worker_add_del_reply_5735ffe7")
 	api.RegisterMessage((*ApplicationDetach)(nil), "application_detach_51077d14")
 	api.RegisterMessage((*ApplicationDetachReply)(nil), "application_detach_reply_e8d4e804")
-	api.RegisterMessage((*ApplicationTLSCertAdd)(nil), "application_tls_cert_add_3f5cfe45")
-	api.RegisterMessage((*ApplicationTLSCertAddReply)(nil), "application_tls_cert_add_reply_e8d4e804")
-	api.RegisterMessage((*ApplicationTLSKeyAdd)(nil), "application_tls_key_add_5eaf70cd")
-	api.RegisterMessage((*ApplicationTLSKeyAddReply)(nil), "application_tls_key_add_reply_e8d4e804")
 	api.RegisterMessage((*SessionEnableDisable)(nil), "session_enable_disable_c264d7bf")
 	api.RegisterMessage((*SessionEnableDisableReply)(nil), "session_enable_disable_reply_e8d4e804")
 	api.RegisterMessage((*SessionRuleAddDel)(nil), "session_rule_add_del_82a90af5")
@@ -1508,10 +1334,6 @@ func AllMessages() []api.Message {
 		(*AppWorkerAddDelReply)(nil),
 		(*ApplicationDetach)(nil),
 		(*ApplicationDetachReply)(nil),
-		(*ApplicationTLSCertAdd)(nil),
-		(*ApplicationTLSCertAddReply)(nil),
-		(*ApplicationTLSKeyAdd)(nil),
-		(*ApplicationTLSKeyAddReply)(nil),
 		(*SessionEnableDisable)(nil),
 		(*SessionEnableDisableReply)(nil),
 		(*SessionRuleAddDel)(nil),
diff --git a/vpplink/generated/bindings/session/session_rpc.ba.go b/vpplink/generated/bindings/session/session_rpc.ba.go
index f902eb93..93f7433e 100644
--- a/vpplink/generated/bindings/session/session_rpc.ba.go
+++ b/vpplink/generated/bindings/session/session_rpc.ba.go
@@ -21,8 +21,6 @@ type RPCService interface {
 	AppNamespaceAddDelV3(ctx context.Context, in *AppNamespaceAddDelV3) (*AppNamespaceAddDelV3Reply, error)
 	AppWorkerAddDel(ctx context.Context, in *AppWorkerAddDel) (*AppWorkerAddDelReply, error)
 	ApplicationDetach(ctx context.Context, in *ApplicationDetach) (*ApplicationDetachReply, error)
-	ApplicationTLSCertAdd(ctx context.Context, in *ApplicationTLSCertAdd) (*ApplicationTLSCertAddReply, error)
-	ApplicationTLSKeyAdd(ctx context.Context, in *ApplicationTLSKeyAdd) (*ApplicationTLSKeyAddReply, error)
 	SessionEnableDisable(ctx context.Context, in *SessionEnableDisable) (*SessionEnableDisableReply, error)
 	SessionRuleAddDel(ctx context.Context, in *SessionRuleAddDel) (*SessionRuleAddDelReply, error)
 	SessionRulesDump(ctx context.Context, in *SessionRulesDump) (RPCService_SessionRulesDumpClient, error)
@@ -109,24 +107,6 @@ func (c *serviceClient) ApplicationDetach(ctx context.Context, in *ApplicationDe
 	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
-func (c *serviceClient) ApplicationTLSCertAdd(ctx context.Context, in *ApplicationTLSCertAdd) (*ApplicationTLSCertAddReply, error) {
-	out := new(ApplicationTLSCertAddReply)
-	err := c.conn.Invoke(ctx, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, api.RetvalToVPPApiError(out.Retval)
-}
-
-func (c *serviceClient) ApplicationTLSKeyAdd(ctx context.Context, in *ApplicationTLSKeyAdd) (*ApplicationTLSKeyAddReply, error) {
-	out := new(ApplicationTLSKeyAddReply)
-	err := c.conn.Invoke(ctx, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, api.RetvalToVPPApiError(out.Retval)
-}
-
 func (c *serviceClient) SessionEnableDisable(ctx context.Context, in *SessionEnableDisable) (*SessionEnableDisableReply, error) {
 	out := new(SessionEnableDisableReply)
 	err := c.conn.Invoke(ctx, in, out)
diff --git a/vpplink/generated/bindings/sr/sr.ba.go b/vpplink/generated/bindings/sr/sr.ba.go
index 39361e7e..18e71c23 100644
--- a/vpplink/generated/bindings/sr/sr.ba.go
+++ b/vpplink/generated/bindings/sr/sr.ba.go
@@ -3,11 +3,14 @@
 // Package sr contains generated bindings for API file sr.api.
 //
 // Contents:
+// -  1 enum
 // -  2 structs
-// - 24 messages
+// - 30 messages
 package sr
 
 import (
+	"strconv"
+
 	interface_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/interface_types"
 	ip_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/ip_types"
 	sr_types "github.com/projectcalico/vpp-dataplane/v3/vpplink/generated/bindings/sr_types"
@@ -23,10 +26,40 @@ const _ = api.GoVppAPIPackageIsVersion2
 
 const (
 	APIFile    = "sr"
-	APIVersion = "2.0.0"
-	VersionCrc = 0x66d92d1b
+	APIVersion = "2.1.0"
+	VersionCrc = 0x1fa846d0
+)
+
+// SrPolicyType defines enum 'sr_policy_type'.
+type SrPolicyType uint8
+
+const (
+	SR_API_POLICY_TYPE_DEFAULT SrPolicyType = 0
+	SR_API_POLICY_TYPE_SPRAY   SrPolicyType = 1
+	SR_API_POLICY_TYPE_TEF     SrPolicyType = 2
+)
+
+var (
+	SrPolicyType_name = map[uint8]string{
+		0: "SR_API_POLICY_TYPE_DEFAULT",
+		1: "SR_API_POLICY_TYPE_SPRAY",
+		2: "SR_API_POLICY_TYPE_TEF",
+	}
+	SrPolicyType_value = map[string]uint8{
+		"SR_API_POLICY_TYPE_DEFAULT": 0,
+		"SR_API_POLICY_TYPE_SPRAY":   1,
+		"SR_API_POLICY_TYPE_TEF":     2,
+	}
 )
 
+func (x SrPolicyType) String() string {
+	s, ok := SrPolicyType_name[uint8(x)]
+	if ok {
+		return s
+	}
+	return "SrPolicyType(" + strconv.Itoa(int(x)) + ")"
+}
+
 // Srv6SidList defines type 'srv6_sid_list'.
 type Srv6SidList struct {
 	NumSids uint8                   `binapi:"u8,name=num_sids" json:"num_sids,omitempty"`
@@ -150,7 +183,6 @@ func (m *SrLocalsidAddDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump the list of SR LocalSIDs
 // SrLocalsidsDetails defines message 'sr_localsids_details'.
 type SrLocalsidsDetails struct {
 	Addr                    ip_types.IP6Address `binapi:"ip6_address,name=addr" json:"addr,omitempty"`
@@ -239,7 +271,6 @@ func (m *SrLocalsidsDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump the list of SR LocalSIDs along with packet statistics
 // SrLocalsidsWithPacketStatsDetails defines message 'sr_localsids_with_packet_stats_details'.
 // InProgress: the message form may change in the future versions
 type SrLocalsidsWithPacketStatsDetails struct {
@@ -350,7 +381,6 @@ func (m *SrLocalsidsWithPacketStatsDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump the list of SR policies
 // SrPoliciesDetails defines message 'sr_policies_details'.
 type SrPoliciesDetails struct {
 	Bsid        ip_types.IP6Address `binapi:"ip6_address,name=bsid" json:"bsid,omitempty"`
@@ -460,7 +490,120 @@ func (m *SrPoliciesDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump the list of SR policies along with actual segment list index on VPP
+// SrPoliciesV2Details defines message 'sr_policies_v2_details'.
+// InProgress: the message form may change in the future versions
+type SrPoliciesV2Details struct {
+	Bsid        ip_types.IP6Address `binapi:"ip6_address,name=bsid" json:"bsid,omitempty"`
+	EncapSrc    ip_types.IP6Address `binapi:"ip6_address,name=encap_src" json:"encap_src,omitempty"`
+	Type        SrPolicyType        `binapi:"sr_policy_type,name=type" json:"type,omitempty"`
+	IsEncap     bool                `binapi:"bool,name=is_encap" json:"is_encap,omitempty"`
+	FibTable    uint32              `binapi:"u32,name=fib_table" json:"fib_table,omitempty"`
+	NumSidLists uint8               `binapi:"u8,name=num_sid_lists" json:"-"`
+	SidLists    []Srv6SidList       `binapi:"srv6_sid_list[num_sid_lists],name=sid_lists" json:"sid_lists,omitempty"`
+}
+
+func (m *SrPoliciesV2Details) Reset()               { *m = SrPoliciesV2Details{} }
+func (*SrPoliciesV2Details) GetMessageName() string { return "sr_policies_v2_details" }
+func (*SrPoliciesV2Details) GetCrcString() string   { return "96dcb699" }
+func (*SrPoliciesV2Details) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *SrPoliciesV2Details) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 1 * 16 // m.Bsid
+	size += 1 * 16 // m.EncapSrc
+	size += 1      // m.Type
+	size += 1      // m.IsEncap
+	size += 4      // m.FibTable
+	size += 1      // m.NumSidLists
+	for j1 := 0; j1 < len(m.SidLists); j1++ {
+		var s1 Srv6SidList
+		_ = s1
+		if j1 < len(m.SidLists) {
+			s1 = m.SidLists[j1]
+		}
+		size += 1 // s1.NumSids
+		size += 4 // s1.Weight
+		for j2 := 0; j2 < 16; j2++ {
+			size += 1 * 16 // s1.Sids[j2]
+		}
+	}
+	return size
+}
+func (m *SrPoliciesV2Details) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeBytes(m.Bsid[:], 16)
+	buf.EncodeBytes(m.EncapSrc[:], 16)
+	buf.EncodeUint8(uint8(m.Type))
+	buf.EncodeBool(m.IsEncap)
+	buf.EncodeUint32(m.FibTable)
+	buf.EncodeUint8(uint8(len(m.SidLists)))
+	for j0 := 0; j0 < len(m.SidLists); j0++ {
+		var v0 Srv6SidList // SidLists
+		if j0 < len(m.SidLists) {
+			v0 = m.SidLists[j0]
+		}
+		buf.EncodeUint8(v0.NumSids)
+		buf.EncodeUint32(v0.Weight)
+		for j1 := 0; j1 < 16; j1++ {
+			buf.EncodeBytes(v0.Sids[j1][:], 16)
+		}
+	}
+	return buf.Bytes(), nil
+}
+func (m *SrPoliciesV2Details) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	copy(m.Bsid[:], buf.DecodeBytes(16))
+	copy(m.EncapSrc[:], buf.DecodeBytes(16))
+	m.Type = SrPolicyType(buf.DecodeUint8())
+	m.IsEncap = buf.DecodeBool()
+	m.FibTable = buf.DecodeUint32()
+	m.NumSidLists = buf.DecodeUint8()
+	m.SidLists = make([]Srv6SidList, m.NumSidLists)
+	for j0 := 0; j0 < len(m.SidLists); j0++ {
+		m.SidLists[j0].NumSids = buf.DecodeUint8()
+		m.SidLists[j0].Weight = buf.DecodeUint32()
+		for j1 := 0; j1 < 16; j1++ {
+			copy(m.SidLists[j0].Sids[j1][:], buf.DecodeBytes(16))
+		}
+	}
+	return nil
+}
+
+// Dump the list of SR policies v2
+// SrPoliciesV2Dump defines message 'sr_policies_v2_dump'.
+type SrPoliciesV2Dump struct{}
+
+func (m *SrPoliciesV2Dump) Reset()               { *m = SrPoliciesV2Dump{} }
+func (*SrPoliciesV2Dump) GetMessageName() string { return "sr_policies_v2_dump" }
+func (*SrPoliciesV2Dump) GetCrcString() string   { return "51077d14" }
+func (*SrPoliciesV2Dump) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *SrPoliciesV2Dump) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	return size
+}
+func (m *SrPoliciesV2Dump) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	return buf.Bytes(), nil
+}
+func (m *SrPoliciesV2Dump) Unmarshal(b []byte) error {
+	return nil
+}
+
 // SrPoliciesWithSlIndexDetails defines message 'sr_policies_with_sl_index_details'.
 // InProgress: the message form may change in the future versions
 type SrPoliciesWithSlIndexDetails struct {
@@ -683,6 +826,119 @@ func (m *SrPolicyAddReply) Unmarshal(b []byte) error {
 	return nil
 }
 
+// IPv6 SR policy add
+//   - bsid is the bindingSID of the SR Policy
+//   - weight is the weight of the sid list. optional.
+//   - is_encap is the behavior of the SR policy. (0.SRH insert // 1.Encapsulation)
+//   - type is the SR policy param. (0.Default // 1.Spray // 2.Tef)
+//   - fib_table is the VRF where to install the FIB entry for the BSID
+//   - sids is a srv6_sid_list object
+//   - encap_src is a encaps IPv6 source addr. optional.
+//
+// SrPolicyAddV2 defines message 'sr_policy_add_v2'.
+// InProgress: the message form may change in the future versions
+type SrPolicyAddV2 struct {
+	BsidAddr ip_types.IP6Address `binapi:"ip6_address,name=bsid_addr" json:"bsid_addr,omitempty"`
+	Weight   uint32              `binapi:"u32,name=weight" json:"weight,omitempty"`
+	IsEncap  bool                `binapi:"bool,name=is_encap" json:"is_encap,omitempty"`
+	Type     SrPolicyType        `binapi:"sr_policy_type,name=type,default=0" json:"type,omitempty"`
+	FibTable uint32              `binapi:"u32,name=fib_table" json:"fib_table,omitempty"`
+	Sids     Srv6SidList         `binapi:"srv6_sid_list,name=sids" json:"sids,omitempty"`
+	EncapSrc ip_types.IP6Address `binapi:"ip6_address,name=encap_src" json:"encap_src,omitempty"`
+}
+
+func (m *SrPolicyAddV2) Reset()               { *m = SrPolicyAddV2{} }
+func (*SrPolicyAddV2) GetMessageName() string { return "sr_policy_add_v2" }
+func (*SrPolicyAddV2) GetCrcString() string   { return "f6297f36" }
+func (*SrPolicyAddV2) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *SrPolicyAddV2) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 1 * 16 // m.BsidAddr
+	size += 4      // m.Weight
+	size += 1      // m.IsEncap
+	size += 1      // m.Type
+	size += 4      // m.FibTable
+	size += 1      // m.Sids.NumSids
+	size += 4      // m.Sids.Weight
+	for j2 := 0; j2 < 16; j2++ {
+		size += 1 * 16 // m.Sids.Sids[j2]
+	}
+	size += 1 * 16 // m.EncapSrc
+	return size
+}
+func (m *SrPolicyAddV2) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeBytes(m.BsidAddr[:], 16)
+	buf.EncodeUint32(m.Weight)
+	buf.EncodeBool(m.IsEncap)
+	buf.EncodeUint8(uint8(m.Type))
+	buf.EncodeUint32(m.FibTable)
+	buf.EncodeUint8(m.Sids.NumSids)
+	buf.EncodeUint32(m.Sids.Weight)
+	for j1 := 0; j1 < 16; j1++ {
+		buf.EncodeBytes(m.Sids.Sids[j1][:], 16)
+	}
+	buf.EncodeBytes(m.EncapSrc[:], 16)
+	return buf.Bytes(), nil
+}
+func (m *SrPolicyAddV2) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	copy(m.BsidAddr[:], buf.DecodeBytes(16))
+	m.Weight = buf.DecodeUint32()
+	m.IsEncap = buf.DecodeBool()
+	m.Type = SrPolicyType(buf.DecodeUint8())
+	m.FibTable = buf.DecodeUint32()
+	m.Sids.NumSids = buf.DecodeUint8()
+	m.Sids.Weight = buf.DecodeUint32()
+	for j1 := 0; j1 < 16; j1++ {
+		copy(m.Sids.Sids[j1][:], buf.DecodeBytes(16))
+	}
+	copy(m.EncapSrc[:], buf.DecodeBytes(16))
+	return nil
+}
+
+// SrPolicyAddV2Reply defines message 'sr_policy_add_v2_reply'.
+// InProgress: the message form may change in the future versions
+type SrPolicyAddV2Reply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *SrPolicyAddV2Reply) Reset()               { *m = SrPolicyAddV2Reply{} }
+func (*SrPolicyAddV2Reply) GetMessageName() string { return "sr_policy_add_v2_reply" }
+func (*SrPolicyAddV2Reply) GetCrcString() string   { return "e8d4e804" }
+func (*SrPolicyAddV2Reply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *SrPolicyAddV2Reply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *SrPolicyAddV2Reply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *SrPolicyAddV2Reply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
 // IPv6 SR policy deletion
 //   - bsid is the bindingSID of the SR Policy
 //   - index is the index of the SR policy
@@ -868,6 +1124,124 @@ func (m *SrPolicyModReply) Unmarshal(b []byte) error {
 	return nil
 }
 
+// IPv6 SR policy modification
+//   - bsid is the bindingSID of the SR Policy
+//   - sr_policy_index is the index of the SR policy
+//   - fib_table is the VRF where to install the FIB entry for the BSID
+//   - operation is the operation to perform (among the top ones)
+//   - sl_index is the index of the Segment List to modify/delete
+//   - weight is the weight of the sid list. optional.
+//   - sids is a srv6_sid_list object
+//   - encap_src is a encaps IPv6 source addr. optional.
+//
+// SrPolicyModV2 defines message 'sr_policy_mod_v2'.
+// InProgress: the message form may change in the future versions
+type SrPolicyModV2 struct {
+	BsidAddr      ip_types.IP6Address `binapi:"ip6_address,name=bsid_addr" json:"bsid_addr,omitempty"`
+	SrPolicyIndex uint32              `binapi:"u32,name=sr_policy_index" json:"sr_policy_index,omitempty"`
+	FibTable      uint32              `binapi:"u32,name=fib_table" json:"fib_table,omitempty"`
+	Operation     sr_types.SrPolicyOp `binapi:"sr_policy_op,name=operation" json:"operation,omitempty"`
+	SlIndex       uint32              `binapi:"u32,name=sl_index" json:"sl_index,omitempty"`
+	Weight        uint32              `binapi:"u32,name=weight" json:"weight,omitempty"`
+	Sids          Srv6SidList         `binapi:"srv6_sid_list,name=sids" json:"sids,omitempty"`
+	EncapSrc      ip_types.IP6Address `binapi:"ip6_address,name=encap_src" json:"encap_src,omitempty"`
+}
+
+func (m *SrPolicyModV2) Reset()               { *m = SrPolicyModV2{} }
+func (*SrPolicyModV2) GetMessageName() string { return "sr_policy_mod_v2" }
+func (*SrPolicyModV2) GetCrcString() string   { return "c0544823" }
+func (*SrPolicyModV2) GetMessageType() api.MessageType {
+	return api.RequestMessage
+}
+
+func (m *SrPolicyModV2) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 1 * 16 // m.BsidAddr
+	size += 4      // m.SrPolicyIndex
+	size += 4      // m.FibTable
+	size += 1      // m.Operation
+	size += 4      // m.SlIndex
+	size += 4      // m.Weight
+	size += 1      // m.Sids.NumSids
+	size += 4      // m.Sids.Weight
+	for j2 := 0; j2 < 16; j2++ {
+		size += 1 * 16 // m.Sids.Sids[j2]
+	}
+	size += 1 * 16 // m.EncapSrc
+	return size
+}
+func (m *SrPolicyModV2) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeBytes(m.BsidAddr[:], 16)
+	buf.EncodeUint32(m.SrPolicyIndex)
+	buf.EncodeUint32(m.FibTable)
+	buf.EncodeUint8(uint8(m.Operation))
+	buf.EncodeUint32(m.SlIndex)
+	buf.EncodeUint32(m.Weight)
+	buf.EncodeUint8(m.Sids.NumSids)
+	buf.EncodeUint32(m.Sids.Weight)
+	for j1 := 0; j1 < 16; j1++ {
+		buf.EncodeBytes(m.Sids.Sids[j1][:], 16)
+	}
+	buf.EncodeBytes(m.EncapSrc[:], 16)
+	return buf.Bytes(), nil
+}
+func (m *SrPolicyModV2) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	copy(m.BsidAddr[:], buf.DecodeBytes(16))
+	m.SrPolicyIndex = buf.DecodeUint32()
+	m.FibTable = buf.DecodeUint32()
+	m.Operation = sr_types.SrPolicyOp(buf.DecodeUint8())
+	m.SlIndex = buf.DecodeUint32()
+	m.Weight = buf.DecodeUint32()
+	m.Sids.NumSids = buf.DecodeUint8()
+	m.Sids.Weight = buf.DecodeUint32()
+	for j1 := 0; j1 < 16; j1++ {
+		copy(m.Sids.Sids[j1][:], buf.DecodeBytes(16))
+	}
+	copy(m.EncapSrc[:], buf.DecodeBytes(16))
+	return nil
+}
+
+// SrPolicyModV2Reply defines message 'sr_policy_mod_v2_reply'.
+// InProgress: the message form may change in the future versions
+type SrPolicyModV2Reply struct {
+	Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *SrPolicyModV2Reply) Reset()               { *m = SrPolicyModV2Reply{} }
+func (*SrPolicyModV2Reply) GetMessageName() string { return "sr_policy_mod_v2_reply" }
+func (*SrPolicyModV2Reply) GetCrcString() string   { return "e8d4e804" }
+func (*SrPolicyModV2Reply) GetMessageType() api.MessageType {
+	return api.ReplyMessage
+}
+
+func (m *SrPolicyModV2Reply) Size() (size int) {
+	if m == nil {
+		return 0
+	}
+	size += 4 // m.Retval
+	return size
+}
+func (m *SrPolicyModV2Reply) Marshal(b []byte) ([]byte, error) {
+	if b == nil {
+		b = make([]byte, m.Size())
+	}
+	buf := codec.NewBuffer(b)
+	buf.EncodeInt32(m.Retval)
+	return buf.Bytes(), nil
+}
+func (m *SrPolicyModV2Reply) Unmarshal(b []byte) error {
+	buf := codec.NewBuffer(b)
+	m.Retval = buf.DecodeInt32()
+	return nil
+}
+
 // IPv6 SR Set SRv6 encapsulation hop-limit
 //   - hop_limit is the hop-limit value to set
 //
@@ -1113,7 +1487,6 @@ func (m *SrSteeringAddDelReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Dump the steering policies
 // SrSteeringPolDetails defines message 'sr_steering_pol_details'.
 type SrSteeringPolDetails struct {
 	TrafficType sr_types.SrSteer               `binapi:"sr_steer,name=traffic_type" json:"traffic_type,omitempty"`
@@ -1207,14 +1580,20 @@ func file_sr_binapi_init() {
 	api.RegisterMessage((*SrLocalsidsWithPacketStatsDump)(nil), "sr_localsids_with_packet_stats_dump_51077d14")
 	api.RegisterMessage((*SrPoliciesDetails)(nil), "sr_policies_details_db6ff2a1")
 	api.RegisterMessage((*SrPoliciesDump)(nil), "sr_policies_dump_51077d14")
+	api.RegisterMessage((*SrPoliciesV2Details)(nil), "sr_policies_v2_details_96dcb699")
+	api.RegisterMessage((*SrPoliciesV2Dump)(nil), "sr_policies_v2_dump_51077d14")
 	api.RegisterMessage((*SrPoliciesWithSlIndexDetails)(nil), "sr_policies_with_sl_index_details_ca2e9bc8")
 	api.RegisterMessage((*SrPoliciesWithSlIndexDump)(nil), "sr_policies_with_sl_index_dump_51077d14")
 	api.RegisterMessage((*SrPolicyAdd)(nil), "sr_policy_add_44ac92e8")
 	api.RegisterMessage((*SrPolicyAddReply)(nil), "sr_policy_add_reply_e8d4e804")
+	api.RegisterMessage((*SrPolicyAddV2)(nil), "sr_policy_add_v2_f6297f36")
+	api.RegisterMessage((*SrPolicyAddV2Reply)(nil), "sr_policy_add_v2_reply_e8d4e804")
 	api.RegisterMessage((*SrPolicyDel)(nil), "sr_policy_del_cb4d48d5")
 	api.RegisterMessage((*SrPolicyDelReply)(nil), "sr_policy_del_reply_e8d4e804")
 	api.RegisterMessage((*SrPolicyMod)(nil), "sr_policy_mod_b97bb56e")
 	api.RegisterMessage((*SrPolicyModReply)(nil), "sr_policy_mod_reply_e8d4e804")
+	api.RegisterMessage((*SrPolicyModV2)(nil), "sr_policy_mod_v2_c0544823")
+	api.RegisterMessage((*SrPolicyModV2Reply)(nil), "sr_policy_mod_v2_reply_e8d4e804")
 	api.RegisterMessage((*SrSetEncapHopLimit)(nil), "sr_set_encap_hop_limit_aa75d7d0")
 	api.RegisterMessage((*SrSetEncapHopLimitReply)(nil), "sr_set_encap_hop_limit_reply_e8d4e804")
 	api.RegisterMessage((*SrSetEncapSource)(nil), "sr_set_encap_source_d3bad5e1")
@@ -1236,14 +1615,20 @@ func AllMessages() []api.Message {
 		(*SrLocalsidsWithPacketStatsDump)(nil),
 		(*SrPoliciesDetails)(nil),
 		(*SrPoliciesDump)(nil),
+		(*SrPoliciesV2Details)(nil),
+		(*SrPoliciesV2Dump)(nil),
 		(*SrPoliciesWithSlIndexDetails)(nil),
 		(*SrPoliciesWithSlIndexDump)(nil),
 		(*SrPolicyAdd)(nil),
 		(*SrPolicyAddReply)(nil),
+		(*SrPolicyAddV2)(nil),
+		(*SrPolicyAddV2Reply)(nil),
 		(*SrPolicyDel)(nil),
 		(*SrPolicyDelReply)(nil),
 		(*SrPolicyMod)(nil),
 		(*SrPolicyModReply)(nil),
+		(*SrPolicyModV2)(nil),
+		(*SrPolicyModV2Reply)(nil),
 		(*SrSetEncapHopLimit)(nil),
 		(*SrSetEncapHopLimitReply)(nil),
 		(*SrSetEncapSource)(nil),
diff --git a/vpplink/generated/bindings/sr/sr_rpc.ba.go b/vpplink/generated/bindings/sr/sr_rpc.ba.go
index 949d0203..cfe55f62 100644
--- a/vpplink/generated/bindings/sr/sr_rpc.ba.go
+++ b/vpplink/generated/bindings/sr/sr_rpc.ba.go
@@ -17,10 +17,13 @@ type RPCService interface {
 	SrLocalsidsDump(ctx context.Context, in *SrLocalsidsDump) (RPCService_SrLocalsidsDumpClient, error)
 	SrLocalsidsWithPacketStatsDump(ctx context.Context, in *SrLocalsidsWithPacketStatsDump) (RPCService_SrLocalsidsWithPacketStatsDumpClient, error)
 	SrPoliciesDump(ctx context.Context, in *SrPoliciesDump) (RPCService_SrPoliciesDumpClient, error)
+	SrPoliciesV2Dump(ctx context.Context, in *SrPoliciesV2Dump) (RPCService_SrPoliciesV2DumpClient, error)
 	SrPoliciesWithSlIndexDump(ctx context.Context, in *SrPoliciesWithSlIndexDump) (RPCService_SrPoliciesWithSlIndexDumpClient, error)
 	SrPolicyAdd(ctx context.Context, in *SrPolicyAdd) (*SrPolicyAddReply, error)
+	SrPolicyAddV2(ctx context.Context, in *SrPolicyAddV2) (*SrPolicyAddV2Reply, error)
 	SrPolicyDel(ctx context.Context, in *SrPolicyDel) (*SrPolicyDelReply, error)
 	SrPolicyMod(ctx context.Context, in *SrPolicyMod) (*SrPolicyModReply, error)
+	SrPolicyModV2(ctx context.Context, in *SrPolicyModV2) (*SrPolicyModV2Reply, error)
 	SrSetEncapHopLimit(ctx context.Context, in *SrSetEncapHopLimit) (*SrSetEncapHopLimitReply, error)
 	SrSetEncapSource(ctx context.Context, in *SrSetEncapSource) (*SrSetEncapSourceReply, error)
 	SrSteeringAddDel(ctx context.Context, in *SrSteeringAddDel) (*SrSteeringAddDelReply, error)
@@ -173,6 +176,49 @@ func (c *serviceClient_SrPoliciesDumpClient) Recv() (*SrPoliciesDetails, error)
 	}
 }
 
+func (c *serviceClient) SrPoliciesV2Dump(ctx context.Context, in *SrPoliciesV2Dump) (RPCService_SrPoliciesV2DumpClient, error) {
+	stream, err := c.conn.NewStream(ctx)
+	if err != nil {
+		return nil, err
+	}
+	x := &serviceClient_SrPoliciesV2DumpClient{stream}
+	if err := x.Stream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type RPCService_SrPoliciesV2DumpClient interface {
+	Recv() (*SrPoliciesV2Details, error)
+	api.Stream
+}
+
+type serviceClient_SrPoliciesV2DumpClient struct {
+	api.Stream
+}
+
+func (c *serviceClient_SrPoliciesV2DumpClient) Recv() (*SrPoliciesV2Details, error) {
+	msg, err := c.Stream.RecvMsg()
+	if err != nil {
+		return nil, err
+	}
+	switch m := msg.(type) {
+	case *SrPoliciesV2Details:
+		return m, nil
+	case *memclnt.ControlPingReply:
+		err = c.Stream.Close()
+		if err != nil {
+			return nil, err
+		}
+		return nil, io.EOF
+	default:
+		return nil, fmt.Errorf("unexpected message: %T %v", m, m)
+	}
+}
+
 func (c *serviceClient) SrPoliciesWithSlIndexDump(ctx context.Context, in *SrPoliciesWithSlIndexDump) (RPCService_SrPoliciesWithSlIndexDumpClient, error) {
 	stream, err := c.conn.NewStream(ctx)
 	if err != nil {
@@ -225,6 +271,15 @@ func (c *serviceClient) SrPolicyAdd(ctx context.Context, in *SrPolicyAdd) (*SrPo
 	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
+func (c *serviceClient) SrPolicyAddV2(ctx context.Context, in *SrPolicyAddV2) (*SrPolicyAddV2Reply, error) {
+	out := new(SrPolicyAddV2Reply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, api.RetvalToVPPApiError(out.Retval)
+}
+
 func (c *serviceClient) SrPolicyDel(ctx context.Context, in *SrPolicyDel) (*SrPolicyDelReply, error) {
 	out := new(SrPolicyDelReply)
 	err := c.conn.Invoke(ctx, in, out)
@@ -243,6 +298,15 @@ func (c *serviceClient) SrPolicyMod(ctx context.Context, in *SrPolicyMod) (*SrPo
 	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
+func (c *serviceClient) SrPolicyModV2(ctx context.Context, in *SrPolicyModV2) (*SrPolicyModV2Reply, error) {
+	out := new(SrPolicyModV2Reply)
+	err := c.conn.Invoke(ctx, in, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, api.RetvalToVPPApiError(out.Retval)
+}
+
 func (c *serviceClient) SrSetEncapHopLimit(ctx context.Context, in *SrSetEncapHopLimit) (*SrSetEncapHopLimitReply, error) {
 	out := new(SrSetEncapHopLimitReply)
 	err := c.conn.Invoke(ctx, in, out)
diff --git a/vpplink/generated/bindings/vlib/vlib.ba.go b/vpplink/generated/bindings/vlib/vlib.ba.go
index 1e1becb8..64574e46 100644
--- a/vpplink/generated/bindings/vlib/vlib.ba.go
+++ b/vpplink/generated/bindings/vlib/vlib.ba.go
@@ -153,9 +153,6 @@ func (m *Cli) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Process a vpe parser cli string request
-//   - cmd_in_shmem - pointer to cli command string
-//
 // CliInband defines message 'cli_inband'.
 type CliInband struct {
 	Cmd string `binapi:"string[],name=cmd" json:"cmd,omitempty"`
@@ -189,10 +186,6 @@ func (m *CliInband) Unmarshal(b []byte) error {
 	return nil
 }
 
-// vpe parser cli string response
-//   - retval - return code for request
-//   - reply_in_shmem - Reply string from cli processing if any
-//
 // CliInbandReply defines message 'cli_inband_reply'.
 type CliInbandReply struct {
 	Retval int32  `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -506,11 +499,6 @@ func (m *GetNextIndexReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// show_threads_reply
-//   - retval - return code
-//   - count - number of threads in thread_data array
-//   - thread_data - array of thread data
-//
 // GetNodeGraph defines message 'get_node_graph'.
 type GetNodeGraph struct{}
 
diff --git a/vpplink/generated/bindings/vpe/vpe.ba.go b/vpplink/generated/bindings/vpe/vpe.ba.go
index 81a89e46..70ba0708 100644
--- a/vpplink/generated/bindings/vpe/vpe.ba.go
+++ b/vpplink/generated/bindings/vpe/vpe.ba.go
@@ -24,10 +24,6 @@ const (
 	VersionCrc = 0xbbfa7484
 )
 
-// Reply for show vpe system time.
-//   - retval - return value
-//   - vpe_system_time - the time in seconds since epoch of the host system.
-//
 // LogDetails defines message 'log_details'.
 type LogDetails struct {
 	Timestamp vpe_types.Timestamp `binapi:"timestamp,name=timestamp" json:"timestamp,omitempty"`
@@ -73,10 +69,6 @@ func (m *LogDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Reply for show vpe system time.
-//   - retval - return value
-//   - vpe_system_time - the time in seconds since epoch of the host system.
-//
 // LogDump defines message 'log_dump'.
 type LogDump struct {
 	StartTimestamp vpe_types.Timestamp `binapi:"timestamp,name=start_timestamp" json:"start_timestamp,omitempty"`
diff --git a/vpplink/generated/bindings/vxlan/vxlan.ba.go b/vpplink/generated/bindings/vxlan/vxlan.ba.go
index 5cb806e2..dfd3d3ee 100644
--- a/vpplink/generated/bindings/vxlan/vxlan.ba.go
+++ b/vpplink/generated/bindings/vxlan/vxlan.ba.go
@@ -183,19 +183,6 @@ func (m *VxlanAddDelTunnel) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Create or delete a VXLAN tunnel
-//   - is_add - Use 1 to create the tunnel, 0 to remove it
-//   - instance - optional unique custom device instance, else ~0.
-//   - src_address - Source IP address
-//   - dst_address - Destination IP address, can be multicast
-//   - src_port - Source UDP port. It is not included in sent packets. Used only for port registration
-//   - dst_port - Destination UDP port
-//   - mcast_sw_if_index - Interface for multicast destination
-//   - encap_vrf_id - Encap route table FIB index
-//   - decap_next_index - index of decap next graph node
-//   - vni - The VXLAN Network Identifier, uint24
-//   - is_l3 - if true, create the interface in L3 mode, w/o MAC
-//
 // VxlanAddDelTunnelReply defines message 'vxlan_add_del_tunnel_reply'.
 type VxlanAddDelTunnelReply struct {
 	Retval    int32                          `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -320,19 +307,6 @@ func (m *VxlanAddDelTunnelV2) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Create or delete a VXLAN tunnel
-//   - is_add - Use 1 to create the tunnel, 0 to remove it
-//   - instance - optional unique custom device instance, else ~0.
-//   - src_address - Source IP address
-//   - dst_address - Destination IP address, can be multicast
-//   - src_port - Source UDP port. It is not included in sent packets. Used only for port registration
-//   - dst_port - Destination UDP port
-//   - mcast_sw_if_index - Interface for multicast destination
-//   - encap_vrf_id - Encap route table FIB index
-//   - decap_next_index - index of decap next graph node
-//   - vni - The VXLAN Network Identifier, uint24
-//   - is_l3 - if true, create the interface in L3 mode, w/o MAC
-//
 // VxlanAddDelTunnelV2Reply defines message 'vxlan_add_del_tunnel_v2_reply'.
 type VxlanAddDelTunnelV2Reply struct {
 	Retval    int32                          `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -462,19 +436,6 @@ func (m *VxlanAddDelTunnelV3) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Create or delete a VXLAN tunnel
-//   - is_add - Use 1 to create the tunnel, 0 to remove it
-//   - instance - optional unique custom device instance, else ~0.
-//   - src_address - Source IP address
-//   - dst_address - Destination IP address, can be multicast
-//   - src_port - Source UDP port. It is not included in sent packets. Used only for port registration
-//   - dst_port - Destination UDP port
-//   - mcast_sw_if_index - Interface for multicast destination
-//   - encap_vrf_id - Encap route table FIB index
-//   - decap_next_index - index of decap next graph node
-//   - vni - The VXLAN Network Identifier, uint24
-//   - is_l3 - if true, create the interface in L3 mode, w/o MAC
-//
 // VxlanAddDelTunnelV3Reply defines message 'vxlan_add_del_tunnel_v3_reply'.
 type VxlanAddDelTunnelV3Reply struct {
 	Retval    int32                          `binapi:"i32,name=retval" json:"retval,omitempty"`
@@ -591,19 +552,6 @@ func (m *VxlanOffloadRxReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Create or delete a VXLAN tunnel
-//   - is_add - Use 1 to create the tunnel, 0 to remove it
-//   - instance - optional unique custom device instance, else ~0.
-//   - src_address - Source IP address
-//   - dst_address - Destination IP address, can be multicast
-//   - src_port - Source UDP port. It is not included in sent packets. Used only for port registration
-//   - dst_port - Destination UDP port
-//   - mcast_sw_if_index - Interface for multicast destination
-//   - encap_vrf_id - Encap route table FIB index
-//   - decap_next_index - index of decap next graph node
-//   - vni - The VXLAN Network Identifier, uint24
-//   - is_l3 - if true, create the interface in L3 mode, w/o MAC
-//
 // VxlanTunnelDetails defines message 'vxlan_tunnel_details'.
 type VxlanTunnelDetails struct {
 	SwIfIndex      interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -671,19 +619,6 @@ func (m *VxlanTunnelDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Create or delete a VXLAN tunnel
-//   - is_add - Use 1 to create the tunnel, 0 to remove it
-//   - instance - optional unique custom device instance, else ~0.
-//   - src_address - Source IP address
-//   - dst_address - Destination IP address, can be multicast
-//   - src_port - Source UDP port. It is not included in sent packets. Used only for port registration
-//   - dst_port - Destination UDP port
-//   - mcast_sw_if_index - Interface for multicast destination
-//   - encap_vrf_id - Encap route table FIB index
-//   - decap_next_index - index of decap next graph node
-//   - vni - The VXLAN Network Identifier, uint24
-//   - is_l3 - if true, create the interface in L3 mode, w/o MAC
-//
 // VxlanTunnelDump defines message 'vxlan_tunnel_dump'.
 type VxlanTunnelDump struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -717,19 +652,6 @@ func (m *VxlanTunnelDump) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Create or delete a VXLAN tunnel
-//   - is_add - Use 1 to create the tunnel, 0 to remove it
-//   - instance - optional unique custom device instance, else ~0.
-//   - src_address - Source IP address
-//   - dst_address - Destination IP address, can be multicast
-//   - src_port - Source UDP port. It is not included in sent packets. Used only for port registration
-//   - dst_port - Destination UDP port
-//   - mcast_sw_if_index - Interface for multicast destination
-//   - encap_vrf_id - Encap route table FIB index
-//   - decap_next_index - index of decap next graph node
-//   - vni - The VXLAN Network Identifier, uint24
-//   - is_l3 - if true, create the interface in L3 mode, w/o MAC
-//
 // VxlanTunnelV2Details defines message 'vxlan_tunnel_v2_details'.
 type VxlanTunnelV2Details struct {
 	SwIfIndex      interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
@@ -805,19 +727,6 @@ func (m *VxlanTunnelV2Details) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Create or delete a VXLAN tunnel
-//   - is_add - Use 1 to create the tunnel, 0 to remove it
-//   - instance - optional unique custom device instance, else ~0.
-//   - src_address - Source IP address
-//   - dst_address - Destination IP address, can be multicast
-//   - src_port - Source UDP port. It is not included in sent packets. Used only for port registration
-//   - dst_port - Destination UDP port
-//   - mcast_sw_if_index - Interface for multicast destination
-//   - encap_vrf_id - Encap route table FIB index
-//   - decap_next_index - index of decap next graph node
-//   - vni - The VXLAN Network Identifier, uint24
-//   - is_l3 - if true, create the interface in L3 mode, w/o MAC
-//
 // VxlanTunnelV2Dump defines message 'vxlan_tunnel_v2_dump'.
 type VxlanTunnelV2Dump struct {
 	SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"`
diff --git a/vpplink/generated/bindings/wireguard/wireguard.ba.go b/vpplink/generated/bindings/wireguard/wireguard.ba.go
index 709de780..98dabff0 100644
--- a/vpplink/generated/bindings/wireguard/wireguard.ba.go
+++ b/vpplink/generated/bindings/wireguard/wireguard.ba.go
@@ -361,10 +361,6 @@ func (m *WireguardInterfaceCreateReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add Wireguard interface interface response
-//   - retval - return status
-//   - sw_if_index - sw_if_index of new interface (for successful add)
-//
 // WireguardInterfaceDelete defines message 'wireguard_interface_delete'.
 // InProgress: the message form may change in the future versions
 type WireguardInterfaceDelete struct {
@@ -435,10 +431,6 @@ func (m *WireguardInterfaceDeleteReply) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add Wireguard interface interface response
-//   - retval - return status
-//   - sw_if_index - sw_if_index of new interface (for successful add)
-//
 // WireguardInterfaceDetails defines message 'wireguard_interface_details'.
 // InProgress: the message form may change in the future versions
 type WireguardInterfaceDetails struct {
@@ -493,10 +485,6 @@ func (m *WireguardInterfaceDetails) Unmarshal(b []byte) error {
 	return nil
 }
 
-// Add Wireguard interface interface response
-//   - retval - return status
-//   - sw_if_index - sw_if_index of new interface (for successful add)
-//
 // WireguardInterfaceDump defines message 'wireguard_interface_dump'.
 // InProgress: the message form may change in the future versions
 type WireguardInterfaceDump struct {
diff --git a/vpplink/generated/generate.log b/vpplink/generated/generate.log
index 7d85f5dc..3b82e407 100755
--- a/vpplink/generated/generate.log
+++ b/vpplink/generated/generate.log
@@ -1,16 +1,15 @@
-VPP Version                 : 23.06-rc0~12-gaca7c2f55
+VPP Version                 : 23.06-rc0~211-gf559a7816
 Binapi-generator version    : govpp v0.8.0-dev
-VPP Base commit             : 7e4be8e78 gerrit:34713/4 vppinfra: improve & test abstract socket
+VPP Base commit             : 004ebac6a gerrit:34726/3 interface: add buffer stats api
 ------------------ Cherry picked commits --------------------
-memif: fix socket name null termination
 capo: Calico Policies plugin
 acl: acl-plugin custom policies
 cnat: [WIP] no k8s maglev from pods
 pbl: Port based balancer
-gerrit:37931/1 ip: add the missing offload check
-gerrit:35805/2 dpdk: add intf tag to dev{} subinput
-gerrit:34726/1 interface: add buffer stats api
-gerrit:34734/3 memif: autogenerate socket_ids
-gerrit:32271/16 memif: add support for ns abstract sockets
-gerrit:34713/4 vppinfra: improve & test abstract socket
+gerrit:34552/8 cnat: add single lookup
+gerrit:29748/5 cnat: remove rwlock on ts
+gerrit:32821/6 cnat: add ip/client bihash
+gerrit:34108/5 cnat: flag to disable rsession
+gerrit:31449/10 cnat: dont compute offloaded cksums
+gerrit:34726/3 interface: add buffer stats api
 -------------------------------------------------------------
diff --git a/vpplink/generated/patches/0001-pbl-Port-based-balancer.patch b/vpplink/generated/patches/0001-pbl-Port-based-balancer.patch
index fcd1ace6..50eca081 100644
--- a/vpplink/generated/patches/0001-pbl-Port-based-balancer.patch
+++ b/vpplink/generated/patches/0001-pbl-Port-based-balancer.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
 Date: Tue, 27 Jul 2021 09:41:55 +0200
-Subject: [PATCH 1/5] pbl: Port based balancer
+Subject: [PATCH 1/4] pbl: Port based balancer
 
 Type: feature
 
@@ -34,10 +34,10 @@ Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
  create mode 100644 src/plugins/pbl/pbl_node.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 5701ebdd9..37d183f6b 100644
+index d65be3844..63447151f 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -700,6 +700,11 @@ I:	svs
+@@ -701,6 +701,11 @@ I:	svs
  M:	Neale Ranns <neale@graphiant.com>
  F:	src/plugins/svs/
  
diff --git a/vpplink/generated/patches/0002-cnat-WIP-no-k8s-maglev-from-pods.patch b/vpplink/generated/patches/0002-cnat-WIP-no-k8s-maglev-from-pods.patch
index 64666251..16249965 100644
--- a/vpplink/generated/patches/0002-cnat-WIP-no-k8s-maglev-from-pods.patch
+++ b/vpplink/generated/patches/0002-cnat-WIP-no-k8s-maglev-from-pods.patch
@@ -1,49 +1,30 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
-Date: Mon, 8 Mar 2021 19:00:04 +0100
-Subject: [PATCH 2/5] cnat: [WIP] no k8s maglev from pods
+Date: Fri, 7 Apr 2023 16:57:30 +0200
+Subject: [PATCH 2/4] cnat: [WIP] no k8s maglev from pods
 
-Type: improvement
-
-Change-Id: If0702dbc51c308f0bb0ed16149c293d7adf9a984
+Change-Id: Id262a97986b6de01a42019287377486787f2e606
 Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
 ---
- src/plugins/cnat/cnat_node_feature.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ src/plugins/cnat/cnat_node_feature.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/plugins/cnat/cnat_node_feature.c b/src/plugins/cnat/cnat_node_feature.c
-index 76aa89398..fd3b90a1a 100644
+index f6d4850f8..f2b65b2ff 100644
 --- a/src/plugins/cnat/cnat_node_feature.c
 +++ b/src/plugins/cnat/cnat_node_feature.c
-@@ -43,6 +43,7 @@ cnat_input_feature_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
- 		       int session_not_found, cnat_session_t *session)
- {
-   vlib_combined_counter_main_t *cntm = &cnat_translation_counters;
-+  cnat_snat_policy_main_t *cpm = &cnat_snat_policy_main;
-   const cnat_translation_t *ct = NULL;
-   ip4_header_t *ip4 = NULL;
-   ip_protocol_t iproto;
-@@ -53,6 +54,9 @@ cnat_input_feature_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
-   index_t cti;
-   u8 trace_flags = 0;
+@@ -112,7 +112,10 @@ cnat_input_feature_new_flow_inline (vlib_main_t *vm, vlib_buffer_t *b,
+ 	    clib_host_to_net_u16 (trk0->ct_ep[VLIB_TX].ce_port) :
+ 	    rw->tuple.port[VLIB_TX];
  
+-  if (trk0->ct_flags & CNAT_TRK_FLAG_NO_NAT)
 +  u32 in_if = vnet_buffer (b)->sw_if_index[VLIB_RX];
-+  int ispod;
-+
-   /* By default follow arc default next */
-   vnet_feature_next (&next0, b);
- 
-@@ -127,7 +131,9 @@ cnat_input_feature_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
-       session->value.cs_port[VLIB_RX] = udp0->src_port;
-       session->value.flags = 0;
- 
--      if (trk0->ct_flags & CNAT_TRK_FLAG_NO_NAT)
-+      ispod = clib_bitmap_get (
-+	cpm->interface_maps[CNAT_SNAT_IF_MAP_INCLUDE_POD], in_if);
-+      if (trk0->ct_flags & CNAT_TRK_FLAG_NO_NAT && !ispod)
- 	{
- 	  const dpo_id_t *dpo0;
- 	  const load_balance_t *lb1;
++  int ispod = clib_bitmap_get (
++    cnat_snat_policy_main.interface_maps[CNAT_SNAT_IF_MAP_INCLUDE_POD], in_if);
++  if (trk0->ct_flags & CNAT_TRK_FLAG_NO_NAT && !ispod)
+     {
+       const dpo_id_t *dpo0;
+       const load_balance_t *lb1;
 -- 
 2.39.2
 
diff --git a/vpplink/generated/patches/0003-acl-acl-plugin-custom-policies.patch b/vpplink/generated/patches/0003-acl-acl-plugin-custom-policies.patch
index 079ce2d1..476eddf5 100644
--- a/vpplink/generated/patches/0003-acl-acl-plugin-custom-policies.patch
+++ b/vpplink/generated/patches/0003-acl-acl-plugin-custom-policies.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andrew Yourtchenko <ayourtch@gmail.com>
 Date: Tue, 28 Jul 2020 10:23:06 +0000
-Subject: [PATCH 3/5] acl: acl-plugin custom policies
+Subject: [PATCH 3/4] acl: acl-plugin custom policies
 
 Type: feature
 Change-Id: I3117e84d9e822b68b12265e9261992e4d7f50f0f
diff --git a/vpplink/generated/patches/0004-capo-Calico-Policies-plugin.patch b/vpplink/generated/patches/0004-capo-Calico-Policies-plugin.patch
index 889b8f52..2f39569c 100644
--- a/vpplink/generated/patches/0004-capo-Calico-Policies-plugin.patch
+++ b/vpplink/generated/patches/0004-capo-Calico-Policies-plugin.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Andrew Yourtchenko <ayourtch@gmail.com>
 Date: Wed, 18 Aug 2021 20:10:22 +0200
-Subject: [PATCH 4/5] capo: Calico Policies plugin
+Subject: [PATCH 4/4] capo: Calico Policies plugin
 
 New plugin that implements Calico policies and profiles in VPP.
 
@@ -15,7 +15,7 @@ Signed-off-by: MathiasRaoul <mathias.raoul@gmail.com>
 ---
  MAINTAINERS                        |   5 +
  src/plugins/capo/CMakeLists.txt    |  28 +
- src/plugins/capo/bihash_8_32.h     | 107 ++++
+ src/plugins/capo/bihash_8_32.h     | 112 ++++
  src/plugins/capo/capo.api          | 261 ++++++++++
  src/plugins/capo/capo.h            |  59 +++
  src/plugins/capo/capo_api.c        | 443 ++++++++++++++++
@@ -31,7 +31,7 @@ Signed-off-by: MathiasRaoul <mathias.raoul@gmail.com>
  src/plugins/capo/capo_rule.h       |  91 ++++
  src/plugins/capo/capo_test.c       | 490 ++++++++++++++++++
  src/plugins/capo/test/test_capo.py | 807 +++++++++++++++++++++++++++++
- 18 files changed, 4861 insertions(+)
+ 18 files changed, 4866 insertions(+)
  create mode 100644 src/plugins/capo/CMakeLists.txt
  create mode 100644 src/plugins/capo/bihash_8_32.h
  create mode 100644 src/plugins/capo/capo.api
@@ -51,10 +51,10 @@ Signed-off-by: MathiasRaoul <mathias.raoul@gmail.com>
  create mode 100644 src/plugins/capo/test/test_capo.py
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 37d183f6b..5705be32f 100644
+index 63447151f..9a0038443 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -743,6 +743,11 @@ M:	Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
+@@ -744,6 +744,11 @@ M:	Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
  M:	Neale Ranns <neale@graphiant.com>
  F:	src/plugins/cnat
  
@@ -102,10 +102,10 @@ index 000000000..9fa10f710
 +)
 diff --git a/src/plugins/capo/bihash_8_32.h b/src/plugins/capo/bihash_8_32.h
 new file mode 100644
-index 000000000..13748c557
+index 000000000..06cdd79e2
 --- /dev/null
 +++ b/src/plugins/capo/bihash_8_32.h
-@@ -0,0 +1,107 @@
+@@ -0,0 +1,112 @@
 +/*
 + * Copyright (c) 2015 Cisco and/or its affiliates.
 + * Licensed under the Apache License, Version 2.0 (the "License");
@@ -150,14 +150,19 @@ index 000000000..13748c557
 +  u64 value[4]; /**< the value */
 +} clib_bihash_kv_8_32_t;
 +
++static inline void
++clib_bihash_mark_free_8_32 (clib_bihash_kv_8_32_t *v)
++{
++  v->value[0] = 0xFEEDFACE8BADF00DULL;
++}
++
 +/** Decide if a clib_bihash_kv_8_32_t instance is free
 +    @param v- pointer to the (key,value) pair
 +*/
 +static inline int
 +clib_bihash_is_free_8_32 (clib_bihash_kv_8_32_t *v)
 +{
-+  if (v->key == ~0ULL && v->value[0] == ~0ULL && v->value[1] == ~0ULL &&
-+      v->value[2] == ~0ULL && v->value[3] == ~0ULL)
++  if (v->value[0] == 0xFEEDFACE8BADF00DULL)
 +    return 1;
 +  return 0;
 +}
diff --git a/vpplink/generated/patches/0005-memif-fix-socket-name-null-termination.patch b/vpplink/generated/patches/0005-memif-fix-socket-name-null-termination.patch
deleted file mode 100644
index 52dfef2a..00000000
--- a/vpplink/generated/patches/0005-memif-fix-socket-name-null-termination.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
-Date: Wed, 1 Mar 2023 18:51:22 +0100
-Subject: [PATCH 5/5] memif: fix socket name null termination
-
-Change-Id: I2bccc0c10c8ab2f2330cb8270cff3c10ff460280
-Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
----
- src/plugins/memif/memif_api.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c
-index 5d32523de..e5ed3b6af 100644
---- a/src/plugins/memif/memif_api.c
-+++ b/src/plugins/memif/memif_api.c
-@@ -92,7 +92,7 @@ vl_api_memif_socket_filename_add_del_v2_t_handler (
- {
-   vl_api_memif_socket_filename_add_del_v2_reply_t *rmp;
-   memif_main_t *mm = &memif_main;
--  u8 *socket_filename = 0;
-+  char *socket_filename = 0;
-   u32 socket_id;
-   int rv;
- 
-@@ -105,11 +105,11 @@ vl_api_memif_socket_filename_add_del_v2_t_handler (
-     }
- 
-   /* socket filename */
--  socket_filename = vl_api_from_api_to_new_vec (mp, &mp->socket_filename);
-+  socket_filename = vl_api_from_api_to_new_c_string (&mp->socket_filename);
-   if (mp->is_add && socket_id == (u32) ~0)
-     socket_id = memif_get_unused_socket_id ();
- 
--  rv = memif_socket_filename_add_del (mp->is_add, socket_id, socket_filename);
-+  rv = memif_socket_filename_add_del (mp->is_add, socket_id, (u8*)socket_filename);
- 
-   vec_free (socket_filename);
- 
--- 
-2.39.2
-
diff --git a/vpplink/generated/vpp_clone_current.sh b/vpplink/generated/vpp_clone_current.sh
index 0b755bce..65af6f11 100755
--- a/vpplink/generated/vpp_clone_current.sh
+++ b/vpplink/generated/vpp_clone_current.sh
@@ -92,20 +92,24 @@ function git_clone_cd_and_reset ()
 
 # --------------- Things to cherry pick ---------------
 
-git_clone_cd_and_reset "$1" 8a0fd0669047c90d410d2ed5cb508bfe778b932a
+git_clone_cd_and_reset "$1" 156d452750ab37a51984938bf4a8ab0e16650d82
 
-git_cherry_pick refs/changes/13/34713/4 # 34713: vppinfra: improve & test abstract socket | https://gerrit.fd.io/r/c/vpp/+/34713
-git_cherry_pick refs/changes/71/32271/16 # 32271: memif: add support for ns abstract sockets | https://gerrit.fd.io/r/c/vpp/+/32271
-git_cherry_pick refs/changes/34/34734/3 # 34734: memif: autogenerate socket_ids | https://gerrit.fd.io/r/c/vpp/+/34734
-git_cherry_pick refs/changes/26/34726/1 # 34726: interface: add buffer stats api | https://gerrit.fd.io/r/c/vpp/+/34726
-git_cherry_pick refs/changes/05/35805/2 # 35805: dpdk: add intf tag to dev{} subinput | https://gerrit.fd.io/r/c/vpp/+/35805
-git_cherry_pick refs/changes/31/37931/1 # 37931: ip: add the missing offload check | https://gerrit.fd.io/r/c/vpp/+/37931
+git_cherry_pick refs/changes/26/34726/3 # 34726: interface: add buffer stats api | https://gerrit.fd.io/r/c/vpp/+/34726
+
+git_cherry_pick refs/changes/49/31449/10 # 31449: cnat: dont compute offloaded cksums | https://gerrit.fd.io/r/c/vpp/+/31449
+git_cherry_pick refs/changes/08/34108/5 # 34108: cnat: flag to disable rsession | https://gerrit.fd.io/r/c/vpp/+/34108
+git_cherry_pick refs/changes/21/32821/6 # 32821: cnat: add ip/client bihash | https://gerrit.fd.io/r/c/vpp/+/32821
+git_cherry_pick refs/changes/48/29748/5 # 29748: cnat: remove rwlock on ts | https://gerrit.fd.io/r/c/vpp/+/29748
+git_cherry_pick refs/changes/52/34552/8 # 34552: cnat: add single lookup | https://gerrit.fd.io/r/c/vpp/+/34552
 
 # --------------- private plugins ---------------
-# Generated with 'git format-patch --zero-commit -o ./patches/ HEAD^'
+# Generated with 'git format-patch --zero-commit -o ./patches/ HEAD^^^'
 git_apply_private 0001-pbl-Port-based-balancer.patch
 git_apply_private 0002-cnat-WIP-no-k8s-maglev-from-pods.patch
 git_apply_private 0003-acl-acl-plugin-custom-policies.patch
 git_apply_private 0004-capo-Calico-Policies-plugin.patch
-git_apply_private 0005-memif-fix-socket-name-null-termination.patch
+
+
+# git cp 236423e261385e58556b75c9f9eb56006a2b9d67 # perf WIP
+# git cp 7603fd367739e74c47349a1dd9662c78dcf9377d # capo+cnat