diff --git a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
index 056246d7fc..6efcb99447 100644
--- a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
+++ b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
@@ -24,7 +24,15 @@ submodule openconfig-bgp-common-multiprotocol {
     for multiple protocols in BGP. The groupings are common across
     multiple contexts.";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2025-05-08" {
+    description
+      "Rename bgp-common-mp-all-afi-safi-common-prefix-limit-config to
+      bgp-common-prefix-limit-config to reflect its use beyond the
+      AFI-SAFI context.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
@@ -539,7 +547,7 @@ submodule openconfig-bgp-common-multiprotocol {
         description
           "Configuration parameters relating to the prefix
           limit for the AFI-SAFI";
-        uses bgp-common-mp-all-afi-safi-common-prefix-limit-config;
+        uses bgp-common-prefix-limit-config;
       }
 
       container state {
@@ -547,7 +555,7 @@ submodule openconfig-bgp-common-multiprotocol {
         description
           "State information relating to the prefix-limit for the
           AFI-SAFI";
-        uses bgp-common-mp-all-afi-safi-common-prefix-limit-config;
+        uses bgp-common-prefix-limit-config;
         uses bgp-common-mp-all-afi-safi-common-prefix-limit-state;
       }
     }
@@ -561,7 +569,7 @@ submodule openconfig-bgp-common-multiprotocol {
         description
           "Configuration parameters relating to the prefix
           limit for the AFI-SAFI";
-        uses bgp-common-mp-all-afi-safi-common-prefix-limit-config;
+        uses bgp-common-prefix-limit-config;
       }
 
       container state {
@@ -569,7 +577,7 @@ submodule openconfig-bgp-common-multiprotocol {
         description
           "State information relating to the prefix-limit for the
           AFI-SAFI";
-        uses bgp-common-mp-all-afi-safi-common-prefix-limit-config;
+        uses bgp-common-prefix-limit-config;
         uses bgp-common-mp-all-afi-safi-common-prefix-limit-state;
       }
     }
@@ -696,16 +704,16 @@ submodule openconfig-bgp-common-multiprotocol {
   }
 
   // Config groupings for common groups
-  grouping bgp-common-mp-all-afi-safi-common-prefix-limit-config {
+  grouping bgp-common-prefix-limit-config {
     description
-      "Configuration parameters relating to prefix-limits for an
-      AFI-SAFI";
+      "Configuration parameters relating to prefix-limits for a BGP
+      neighbor, peer-group, or global instance.";
 
     leaf max-prefixes {
       type uint32;
       description
         "Maximum number of prefixes that will be accepted
-        from the neighbor";
+        or received from the neighbor";
     }
 
     leaf prevent-teardown {
@@ -722,10 +730,10 @@ submodule openconfig-bgp-common-multiprotocol {
     leaf warning-threshold-pct {
       type oc-types:percentage;
       description
-        "Threshold on number of prefixes that can be received
-        from a neighbor before generation of warning messages
-        or log entries. Expressed as a percentage of
-        max-prefixes";
+        "Threshold on number of prefixes that can be accepted
+        or received from a neighbor before generation of
+        warning messages or log entries. Expressed as a
+        percentage of max-prefixes";
     }
   }
 
diff --git a/release/models/bgp/openconfig-bgp-common-structure.yang b/release/models/bgp/openconfig-bgp-common-structure.yang
index d233f26f8c..40a5e80d44 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.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2025-05-08" {
+    description
+      "Add structural groupings for non-AFI-SAFI prefix-limit and
+      prefix-limit-received at neighbor, peer-group, and global levels.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
@@ -399,4 +406,48 @@ submodule openconfig-bgp-common-structure {
     }
   }
 
+  grouping bgp-common-structure-prefix-limit {
+    description
+      "Structural grouping for a non-AFI-SAFI prefix-limit applicable at
+      the neighbor, peer-group, or global BGP level.";
+
+    container prefix-limit {
+      description
+        "Configure the maximum number of prefixes that will be accepted
+        across all address families.";
+
+      container config {
+        description
+          "Configuration parameters relating to the prefix-limit.";
+        uses bgp-common-prefix-limit-config;
+      }
+
+      container state {
+        config false;
+        description
+          "State information relating to the prefix-limit.";
+        uses bgp-common-prefix-limit-config;
+      }
+    }
+
+    container prefix-limit-received {
+      description
+        "Configure the maximum number of prefixes that will be received
+        across all address families.";
+
+      container config {
+        description
+          "Configuration parameters relating to the prefix-limit-received.";
+        uses bgp-common-prefix-limit-config;
+      }
+
+      container state {
+        config false;
+        description
+          "State information relating to the prefix-limit-received.";
+        uses bgp-common-prefix-limit-config;
+      }
+    }
+  }
+
 }
diff --git a/release/models/bgp/openconfig-bgp-global.yang b/release/models/bgp/openconfig-bgp-global.yang
index 4921fc07b9..59cf0aee38 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.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2025-05-08" {
+    description
+      "Add global default prefix-limit and prefix-limit-received at BGP global level.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
@@ -522,6 +528,7 @@ submodule openconfig-bgp-global {
       }
     }
 
+    uses bgp-common-structure-prefix-limit;
     uses bgp-common-global-group-use-multiple-paths;
     uses bgp-common-route-selection-options;
 
diff --git a/release/models/bgp/openconfig-bgp-neighbor.yang b/release/models/bgp/openconfig-bgp-neighbor.yang
index 9afa0c748d..bdf33b03c2 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.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2025-05-08" {
+    description
+      "Add non-AFI-SAFI prefix-limit and prefix-limit-received at neighbor level.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
@@ -868,6 +874,7 @@ submodule openconfig-bgp-neighbor {
     uses bgp-common-structure-neighbor-group-route-reflector;
     uses bgp-common-structure-neighbor-group-as-path-options;
     uses bgp-common-structure-neighbor-group-auto-link-bandwidth;
+    uses bgp-common-structure-prefix-limit;
     uses bgp-neighbor-use-multiple-paths;
     uses oc-rpol:apply-policy-group;
 
diff --git a/release/models/bgp/openconfig-bgp-peer-group.yang b/release/models/bgp/openconfig-bgp-peer-group.yang
index cb336f9985..c3a5ee9967 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.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2025-05-08" {
+    description
+      "Add non-AFI-SAFI prefix-limit and prefix-limit-received at peer-group level.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
@@ -376,6 +382,7 @@ submodule openconfig-bgp-peer-group {
     uses bgp-common-structure-neighbor-group-route-reflector;
     uses bgp-common-structure-neighbor-group-as-path-options;
     uses bgp-common-structure-neighbor-group-auto-link-bandwidth;
+    uses bgp-common-structure-prefix-limit;
     uses bgp-common-global-group-use-multiple-paths;
     uses oc-rpol:apply-policy-group;