diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index 8d2436fc6..cc7b05b47 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -471,12 +471,16 @@ submodule openconfig-aft-common {
     leaf pop-top-label {
       type boolean;
       default false;
+      status deprecated;
       description
         "Flag that controls pop action, i.e., the top-most MPLS label
          should be popped from the packet when switched by the system.
 
         The top-most MPLS label associated with pop action is equal to
-        the label key used in 'mpls' AFT 'label-entry' list.";
+        the label key used in 'mpls' AFT 'label-entry' list.
+
+        This node is deprecated and the encap-headers/encap-header tree
+        should be used instead.";
     }
 
     leaf-list pushed-mpls-label-stack {
@@ -574,6 +578,17 @@ submodule openconfig-aft-common {
          EXP bits.";
     }
 
+    leaf pop-top-label {
+      type boolean;
+      default false;
+      description
+        "Flag that controls pop action, i.e., the top-most MPLS label
+         should be popped from the packet when switched by the system.
+
+        The top-most MPLS label associated with pop action is equal to
+        the label key used in 'mpls' AFT 'label-entry' list.";
+    }
+
     leaf-list pushed-mpls-label-stack {
       type oc-mplst:mpls-label-stack;
       ordered-by user;