diff --git a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
index 884bbe8be..6d4bc9d75 100644
--- a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
+++ b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common-multiprotocol {
     for multiple protocols in BGP. The groupings are common across
     multiple contexts.";
 
-  oc-ext:openconfig-version "9.8.0";
+  oc-ext:openconfig-version "9.9.0";
+
+  revision "2024-09-25" {
+    description
+      "Add next-hop-unchanged to bgp afi-safi.";
+    reference "9.9.0";
+  }
 
   revision "2024-09-06" {
     description
@@ -35,7 +41,7 @@ submodule openconfig-bgp-common-multiprotocol {
   revision "2023-12-28" {
     description
       "Clarification to last-prefix-limit-exceeded in description";
-          reference "9.7.1";
+    reference "9.7.1";
   }
 
   revision "2023-12-28" {
@@ -741,5 +747,13 @@ submodule openconfig-bgp-common-multiprotocol {
       description
         "If set to true, send the default-route to the neighbor(s)";
     }
+    leaf next-hop-unchanged {
+     type boolean;
+     default "false";
+     description
+      "Override the default eBGP behavior of rewriting the next-hop when
+      advertising a route and instead keep the next-hop learned from a
+      neighbor.";
+    }
   }
 }
diff --git a/release/models/bgp/openconfig-bgp-common-structure.yang b/release/models/bgp/openconfig-bgp-common-structure.yang
index 8aee8797b..5e53c81c3 100644
--- a/release/models/bgp/openconfig-bgp-common-structure.yang
+++ b/release/models/bgp/openconfig-bgp-common-structure.yang
@@ -21,7 +21,13 @@ 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.8.0";
+  oc-ext:openconfig-version "9.9.0";
+
+  revision "2024-09-25" {
+    description
+      "Add next-hop-unchanged to bgp afi-safi.";
+    reference "9.9.0";
+  }
 
   revision "2024-09-06" {
     description
@@ -32,7 +38,7 @@ submodule openconfig-bgp-common-structure {
   revision "2023-12-28" {
     description
       "Clarification to last-prefix-limit-exceeded in description";
-          reference "9.7.1";
+    reference "9.7.1";
   }
 
   revision "2023-12-28" {
diff --git a/release/models/bgp/openconfig-bgp-common.yang b/release/models/bgp/openconfig-bgp-common.yang
index ac1a3983f..5cf14b753 100644
--- a/release/models/bgp/openconfig-bgp-common.yang
+++ b/release/models/bgp/openconfig-bgp-common.yang
@@ -24,7 +24,13 @@ submodule openconfig-bgp-common {
     may be application to a subset of global, peer-group or neighbor
     contexts.";
 
-  oc-ext:openconfig-version "9.8.0";
+  oc-ext:openconfig-version "9.9.0";
+
+  revision "2024-09-25" {
+    description
+      "Add next-hop-unchanged to bgp afi-safi.";
+    reference "9.9.0";
+  }
 
   revision "2024-09-06" {
     description
@@ -35,14 +41,14 @@ submodule openconfig-bgp-common {
   revision "2023-12-28" {
     description
       "Clarification to last-prefix-limit-exceeded in description";
-          reference "9.7.1";
+    reference "9.7.1";
   }
 
   revision "2023-12-28" {
     description
       "Add support for controling use of link-bandwidth extended
       community for BGP multipath.";
-          reference "9.7.0";
+    reference "9.7.0";
   }
 
   revision "2023-11-02" {
@@ -439,6 +445,7 @@ submodule openconfig-bgp-common {
         "Time-to-live value to use when packets are sent to the
         referenced group or neighbors and ebgp-multihop is enabled";
     }
+
   }
 
   grouping bgp-common-neighbor-group-route-reflector-config {
diff --git a/release/models/bgp/openconfig-bgp-global.yang b/release/models/bgp/openconfig-bgp-global.yang
index 9a1480182..4bcfe835c 100644
--- a/release/models/bgp/openconfig-bgp-global.yang
+++ b/release/models/bgp/openconfig-bgp-global.yang
@@ -27,7 +27,13 @@ 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.8.0";
+  oc-ext:openconfig-version "9.9.0";
+
+  revision "2024-09-25" {
+    description
+      "Add next-hop-unchanged to bgp afi-safi.";
+    reference "9.9.0";
+  }
 
   revision "2024-09-06" {
     description
@@ -38,7 +44,7 @@ submodule openconfig-bgp-global {
   revision "2023-12-28" {
     description
       "Clarification to last-prefix-limit-exceeded in description";
-          reference "9.7.1";
+    reference "9.7.1";
   }
 
   revision "2023-12-28" {
diff --git a/release/models/bgp/openconfig-bgp-neighbor.yang b/release/models/bgp/openconfig-bgp-neighbor.yang
index ddcef2e8b..0d7d5f53f 100644
--- a/release/models/bgp/openconfig-bgp-neighbor.yang
+++ b/release/models/bgp/openconfig-bgp-neighbor.yang
@@ -30,7 +30,13 @@ 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.8.0";
+  oc-ext:openconfig-version "9.9.0";
+
+  revision "2024-09-25" {
+    description
+      "Add next-hop-unchanged to bgp afi-safi.";
+    reference "9.9.0";
+  }
 
   revision "2024-09-06" {
     description
@@ -41,14 +47,14 @@ submodule openconfig-bgp-neighbor {
   revision "2023-12-28" {
     description
       "Clarification to last-prefix-limit-exceeded in description";
-          reference "9.7.1";
+    reference "9.7.1";
   }
 
   revision "2023-12-28" {
     description
       "Add support for controling use of link-bandwidth extended
       community for BGP multipath.";
-          reference "9.7.0";
+    reference "9.7.0";
   }
 
   revision "2023-11-02" {
diff --git a/release/models/bgp/openconfig-bgp-peer-group.yang b/release/models/bgp/openconfig-bgp-peer-group.yang
index aba5163ac..c9e55ccd7 100644
--- a/release/models/bgp/openconfig-bgp-peer-group.yang
+++ b/release/models/bgp/openconfig-bgp-peer-group.yang
@@ -25,7 +25,13 @@ 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.8.0";
+  oc-ext:openconfig-version "9.9.0";
+
+  revision "2024-09-25" {
+    description
+      "Add next-hop-unchanged to bgp afi-safi.";
+    reference "9.9.0";
+  }
 
   revision "2024-09-06" {
     description
@@ -36,7 +42,7 @@ submodule openconfig-bgp-peer-group {
   revision "2023-12-28" {
     description
       "Clarification to last-prefix-limit-exceeded in description";
-          reference "9.7.1";
+    reference "9.7.1";
   }
 
   revision "2023-12-28" {
diff --git a/release/models/bgp/openconfig-bgp.yang b/release/models/bgp/openconfig-bgp.yang
index 054f3cdd9..92f87e91b 100644
--- a/release/models/bgp/openconfig-bgp.yang
+++ b/release/models/bgp/openconfig-bgp.yang
@@ -68,7 +68,13 @@ 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.8.0";
+  oc-ext:openconfig-version "9.9.0";
+
+  revision "2024-09-25" {
+    description
+      "Add next-hop-unchanged to bgp afi-safi.";
+    reference "9.9.0";
+  }
 
   revision "2024-09-06" {
     description
@@ -79,14 +85,14 @@ module openconfig-bgp {
   revision "2023-12-28" {
     description
       "Clarification to last-prefix-limit-exceeded in description";
-          reference "9.7.1";
+    reference "9.7.1";
   }
 
   revision "2023-12-28" {
     description
       "Add support for controling use of link-bandwidth extended
       community for BGP multipath.";
-          reference "9.7.0";
+    reference "9.7.0";
   }
 
   revision "2023-11-02" {