diff --git a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
index e85eca584..6a4a77c89 100644
--- a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
+++ b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
@@ -24,7 +24,14 @@ submodule openconfig-bgp-common-multiprotocol {
     for multiple protocols in BGP. The groupings are common across
     multiple contexts.";
 
-  oc-ext:openconfig-version "9.5.0";
+  oc-ext:openconfig-version "9.6.0";
+
+  revision "2023-11-16" {
+    description
+      "Allow configuring VPN label allocation for received paths
+      to IPv4 and IPv6 Unicast L3VPN AFI-SAFI.";
+      reference "9.6.0";
+  }
 
   revision "2023-11-01" {
     description
@@ -580,8 +587,21 @@ submodule openconfig-bgp-common-multiprotocol {
       "Common configuration applied across L3VPN for IPv4
        and IPv6";
 
-    // placeholder -- specific configuration options that are generic
-    // across IPv[46] unicast address families.
+    // specific configuration options that are generic
+    // accross L3VPN IPv[46] unicast address families.
+    container config {
+      description
+        "Configuration parameters for L3VPN IPv[46] Unicast AFI-SAFI options";
+      uses bgp-common-mp-l3vpn-ipv4-ipv6-unicast-common-config;
+    }
+
+    container state {
+      config false;
+      description
+        "State information for L3VPN IPv[46] Unicast parameters";
+      uses bgp-common-mp-l3vpn-ipv4-ipv6-unicast-common-config;
+    }
+
     uses bgp-common-mp-all-afi-safi-common;
   }
 
@@ -706,4 +726,17 @@ submodule openconfig-bgp-common-multiprotocol {
         "If set to true, send the default-route to the neighbor(s)";
     }
   }
+
+  grouping bgp-common-mp-l3vpn-ipv4-ipv6-unicast-common-config {
+    description
+      "Common configuration parameters for L3VPN IPv4 Unicast
+       and L3VPN IPv6 Unicast address families";
+
+    leaf allocate-vpn-label-received-paths {
+      type boolean;
+      description
+        "This leaf indicates whether the allocation of
+        locally computed VPN label is enabled for received VPN paths";
+    }
+  }
 }
diff --git a/release/models/bgp/openconfig-bgp-common-structure.yang b/release/models/bgp/openconfig-bgp-common-structure.yang
index 92ea39425..721b769fe 100644
--- a/release/models/bgp/openconfig-bgp-common-structure.yang
+++ b/release/models/bgp/openconfig-bgp-common-structure.yang
@@ -21,7 +21,14 @@ submodule openconfig-bgp-common-structure {
     "This sub-module contains groupings that are common across multiple BGP
     contexts and provide structure around other primitive groupings.";
 
-  oc-ext:openconfig-version "9.5.0";
+  oc-ext:openconfig-version "9.6.0";
+
+  revision "2023-11-16" {
+    description
+      "Allow configuring VPN label allocation for received paths
+      to IPv4 and IPv6 Unicast L3VPN AFI-SAFI.";
+      reference "9.6.0";
+  }
 
   revision "2023-11-01" {
     description
diff --git a/release/models/bgp/openconfig-bgp-common.yang b/release/models/bgp/openconfig-bgp-common.yang
index 07d38a027..9351501e0 100644
--- a/release/models/bgp/openconfig-bgp-common.yang
+++ b/release/models/bgp/openconfig-bgp-common.yang
@@ -24,7 +24,14 @@ submodule openconfig-bgp-common {
     may be application to a subset of global, peer-group or neighbor
     contexts.";
 
-  oc-ext:openconfig-version "9.5.0";
+  oc-ext:openconfig-version "9.6.0";
+
+  revision "2023-11-16" {
+    description
+      "Allow configuring VPN label allocation for received paths
+      to IPv4 and IPv6 Unicast L3VPN AFI-SAFI.";
+      reference "9.6.0";
+  }
 
   revision "2023-11-01" {
     description
diff --git a/release/models/bgp/openconfig-bgp-global.yang b/release/models/bgp/openconfig-bgp-global.yang
index 761becbf1..d43102e9b 100644
--- a/release/models/bgp/openconfig-bgp-global.yang
+++ b/release/models/bgp/openconfig-bgp-global.yang
@@ -27,7 +27,14 @@ submodule openconfig-bgp-global {
     "This sub-module contains groupings that are specific to the
     global context of the OpenConfig BGP module";
 
-  oc-ext:openconfig-version "9.5.0";
+  oc-ext:openconfig-version "9.6.0";
+
+  revision "2023-11-16" {
+    description
+      "Allow configuring VPN label allocation for received paths
+      to IPv4 and IPv6 Unicast L3VPN AFI-SAFI.";
+      reference "9.6.0";
+  }
 
   revision "2023-11-01" {
     description
diff --git a/release/models/bgp/openconfig-bgp-neighbor.yang b/release/models/bgp/openconfig-bgp-neighbor.yang
index 830c76d91..95ed4fbdf 100644
--- a/release/models/bgp/openconfig-bgp-neighbor.yang
+++ b/release/models/bgp/openconfig-bgp-neighbor.yang
@@ -30,7 +30,14 @@ submodule openconfig-bgp-neighbor {
     "This sub-module contains groupings that are specific to the
     neighbor context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "9.5.0";
+  oc-ext:openconfig-version "9.6.0";
+
+  revision "2023-11-16" {
+    description
+      "Allow configuring VPN label allocation for received paths
+      to IPv4 and IPv6 Unicast L3VPN AFI-SAFI.";
+      reference "9.6.0";
+  }
 
   revision "2023-11-01" {
     description
diff --git a/release/models/bgp/openconfig-bgp-peer-group.yang b/release/models/bgp/openconfig-bgp-peer-group.yang
index 84c12d090..07dc91ca3 100644
--- a/release/models/bgp/openconfig-bgp-peer-group.yang
+++ b/release/models/bgp/openconfig-bgp-peer-group.yang
@@ -25,7 +25,14 @@ submodule openconfig-bgp-peer-group {
     "This sub-module contains groupings that are specific to the
     peer-group context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "9.5.0";
+  oc-ext:openconfig-version "9.6.0";
+
+  revision "2023-11-16" {
+    description
+      "Allow configuring VPN label allocation for received paths
+      to IPv4 and IPv6 Unicast L3VPN AFI-SAFI.";
+      reference "9.6.0";
+  }
 
   revision "2023-11-01" {
     description
diff --git a/release/models/bgp/openconfig-bgp.yang b/release/models/bgp/openconfig-bgp.yang
index 6d28c872e..235b1c188 100644
--- a/release/models/bgp/openconfig-bgp.yang
+++ b/release/models/bgp/openconfig-bgp.yang
@@ -68,7 +68,14 @@ module openconfig-bgp {
     whereas leaf not present inherits its value from the leaf present
     at the next higher level in the hierarchy.";
 
-  oc-ext:openconfig-version "9.5.0";
+  oc-ext:openconfig-version "9.6.0";
+
+  revision "2023-11-16" {
+    description
+      "Allow configuring VPN label allocation for received paths
+      to IPv4 and IPv6 Unicast L3VPN AFI-SAFI.";
+      reference "9.6.0";
+  }
 
   revision "2023-11-01" {
     description