diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index ac924b67c..c69587e0f 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -23,7 +23,13 @@ submodule openconfig-aft-common {
     "Submodule containing definitions of groupings that are re-used
     across multiple contexts within the AFT model.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
+
+  revision "2024-04-25" {
+    description
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
+  }
 
   revision "2024-01-26" {
     description
@@ -693,6 +699,20 @@ submodule openconfig-aft-common {
         entries within the next-hop group become unusable, the backup
         next-hop group is used if specified.";
     }
+
+    leaf backup-active {
+      type boolean;
+      default false;
+      description
+        "Set to true if and only if the device no longer forwards traffic
+        using the primary NextHops of this NextHopGroup and instead uses
+        the specified backup-next-hop-group. This leaf should be set to
+        false if the backup-next-hop-group is either unspecified or unused
+        by the device.";
+    }
+
+
+
   }
 
   grouping aft-nhg-nh-state {
diff --git a/release/models/aft/openconfig-aft-ethernet.yang b/release/models/aft/openconfig-aft-ethernet.yang
index 2845c9383..b2c0758df 100644
--- a/release/models/aft/openconfig-aft-ethernet.yang
+++ b/release/models/aft/openconfig-aft-ethernet.yang
@@ -20,7 +20,13 @@ submodule openconfig-aft-ethernet {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for Ethernet.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
+
+  revision "2024-04-25" {
+    description
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
+  }
 
   revision "2024-01-26" {
     description
diff --git a/release/models/aft/openconfig-aft-ipv4.yang b/release/models/aft/openconfig-aft-ipv4.yang
index f6152aca8..d582b2ad7 100644
--- a/release/models/aft/openconfig-aft-ipv4.yang
+++ b/release/models/aft/openconfig-aft-ipv4.yang
@@ -20,7 +20,13 @@ submodule openconfig-aft-ipv4 {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for IPv4.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
+
+  revision "2024-04-25" {
+    description
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
+  }
 
   revision "2024-01-26" {
     description
diff --git a/release/models/aft/openconfig-aft-ipv6.yang b/release/models/aft/openconfig-aft-ipv6.yang
index 1976a7271..c8aede635 100644
--- a/release/models/aft/openconfig-aft-ipv6.yang
+++ b/release/models/aft/openconfig-aft-ipv6.yang
@@ -20,7 +20,13 @@ submodule openconfig-aft-ipv6 {
     "Submodule containing definitions of groupings for the abstract
     forwarding tables for IPv6.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
+
+  revision "2024-04-25" {
+    description
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
+  }
 
   revision "2024-01-26" {
     description
diff --git a/release/models/aft/openconfig-aft-mpls.yang b/release/models/aft/openconfig-aft-mpls.yang
index 77091afa4..2418a5a9e 100644
--- a/release/models/aft/openconfig-aft-mpls.yang
+++ b/release/models/aft/openconfig-aft-mpls.yang
@@ -21,20 +21,18 @@ submodule openconfig-aft-mpls {
     "Submodule containing definitions of groupings for the abstract
     forwarding table for MPLS label forwarding.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
 
-  revision "2024-01-26" {
+  revision "2024-04-25" {
     description
-      "Add gre container under next-hops aft entry state.
-      Add src-ip, dst-ip and ttl under gre aft entry state
-      for telemetry.";
-    reference "2.5.0";
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
   }
 
-  revision "2023-09-26" {
+  revision "2024-04-25" {
     description
-      "Add next-hop-group-name in NHG AFT entry state.";
-    reference "2.4.0";
+      "Add backup-active to AFT NHG state.";
+    reference "2.5.0";
   }
 
   revision "2023-04-19" {
diff --git a/release/models/aft/openconfig-aft-pf.yang b/release/models/aft/openconfig-aft-pf.yang
index fc72ece6e..8f0d5a243 100644
--- a/release/models/aft/openconfig-aft-pf.yang
+++ b/release/models/aft/openconfig-aft-pf.yang
@@ -28,7 +28,13 @@ submodule openconfig-aft-pf {
     fields other than the destination address that is used in
     other forwarding tables.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
+
+  revision "2024-04-25" {
+    description
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
+  }
 
   revision "2024-01-26" {
     description
diff --git a/release/models/aft/openconfig-aft-state-synced.yang b/release/models/aft/openconfig-aft-state-synced.yang
index 166ad7ead..3e0950826 100644
--- a/release/models/aft/openconfig-aft-state-synced.yang
+++ b/release/models/aft/openconfig-aft-state-synced.yang
@@ -16,7 +16,13 @@ submodule openconfig-aft-state-synced {
     "Submodule containing definitions of groupings for the state
     synced signals corresponding to various abstract forwarding tables.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
+
+  revision "2024-04-25" {
+    description
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
+  }
 
   revision "2024-01-26" {
     description
diff --git a/release/models/aft/openconfig-aft.yang b/release/models/aft/openconfig-aft.yang
index 011956948..d1af3e977 100644
--- a/release/models/aft/openconfig-aft.yang
+++ b/release/models/aft/openconfig-aft.yang
@@ -42,7 +42,13 @@ module openconfig-aft {
     is referred to as an Abstract Forwarding Table (AFT), rather than
     the FIB.";
 
-  oc-ext:openconfig-version "2.5.0";
+  oc-ext:openconfig-version "2.6.0";
+
+  revision "2024-04-25" {
+    description
+      "Add backup-active to AFT NHG state.";
+    reference "2.6.0";
+  }
 
   revision "2024-01-26" {
     description