diff --git a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4 b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
index 34a88b8..10c4467 100644
--- a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
@@ -30,13 +30,86 @@
 #define MAX_PDR_COUNTERS  2 * MAX_UES
 #define MAX_FARS          2 * MAX_UES
 
+control DecapGtpu(inout parsed_headers_t hdr,
+                  inout fabric_metadata_t fabric_md) {
+    @hidden
+    action decap_inner_common() {
+        // Correct parser-set metadata to use the inner header values
+        fabric_md.ip_eth_type   = ETHERTYPE_IPV4;
+        fabric_md.ip_proto      = hdr.inner_ipv4.protocol;
+        fabric_md.ipv4_src_addr = hdr.inner_ipv4.src_addr;
+        fabric_md.ipv4_dst_addr = hdr.inner_ipv4.dst_addr;
+        fabric_md.l4_sport      = fabric_md.inner_l4_sport;
+        fabric_md.l4_dport      = fabric_md.inner_l4_dport;
+        // Move GTPU and inner L3 headers out
+        hdr.ipv4 = hdr.inner_ipv4;
+        hdr.inner_ipv4.setInvalid();
+        hdr.gtpu.setInvalid();
+    }
+    @hidden
+    action decap_inner_tcp() {
+        decap_inner_common();
+        hdr.udp.setInvalid();
+        hdr.tcp = hdr.inner_tcp;
+        hdr.inner_tcp.setInvalid();
+    }
+    @hidden
+    action decap_inner_udp() {
+        decap_inner_common();
+        hdr.udp = hdr.inner_udp;
+        hdr.inner_udp.setInvalid();
+    }
+    @hidden
+    action decap_inner_icmp() {
+        decap_inner_common();
+        hdr.udp.setInvalid();
+        hdr.icmp = hdr.inner_icmp;
+        hdr.inner_icmp.setInvalid();
+    }
+    @hidden
+    action decap_inner_unknown() {
+        decap_inner_common();
+        hdr.udp.setInvalid();
+    }
+    @hidden
+    table decap_gtpu {
+        key = {
+            hdr.inner_tcp.isValid()  : exact;
+            hdr.inner_udp.isValid()  : exact;
+            hdr.inner_icmp.isValid() : exact;
+        }
+        actions = {
+            decap_inner_tcp;
+            decap_inner_udp;
+            decap_inner_icmp;
+            decap_inner_unknown;
+        }
+        const default_action = decap_inner_unknown;
+        const entries = {
+            (true,  false, false) : decap_inner_tcp();
+            (false, true,  false) : decap_inner_udp();
+            (false, false, true)  : decap_inner_icmp();
+        }
+        size = 4;
+    }
+    apply {
+        decap_gtpu.apply();
+    }
+}
 
 
 control SpgwIngress(inout parsed_headers_t hdr,
                     inout fabric_metadata_t fabric_md,
                     inout standard_metadata_t standard_metadata) {
 
+    //=============================//
+    //===== Misc Things ======//
+    //=============================//
+    
+    counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
 
+    DecapGtpu() decap_gtpu_from_dbuf;
+    DecapGtpu() decap_gtpu;
 
 
     //=============================//
@@ -135,7 +208,8 @@
     action load_normal_far_attributes(bit<1> drop,
                                       bit<1> notify_cp) {
         // general far attributes
-        fabric_md.spgw.far_dropped  = (_BOOL)drop;
+        fabric_md.skip_forwarding = (_BOOL)drop;
+        fabric_md.skip_next = (_BOOL)drop;
         fabric_md.spgw.notify_spgwc = (_BOOL)notify_cp;
     }
     action load_tunnel_far_attributes(bit<1>      drop,
@@ -145,7 +219,8 @@
                                       bit<32>   tunnel_dst_addr,
                                       teid_t    teid) {
         // general far attributes
-        fabric_md.spgw.far_dropped  = (_BOOL)drop;
+        fabric_md.skip_forwarding = (_BOOL)drop;
+        fabric_md.skip_next = (_BOOL)drop;
         fabric_md.spgw.notify_spgwc = (_BOOL)notify_cp;
         // GTP tunnel attributes
         fabric_md.spgw.needs_gtpu_encap = _TRUE;
@@ -160,6 +235,17 @@
         fabric_md.l4_dport = UDP_PORT_GTPU;
     }
 
+    action load_dbuf_far_attributes(bit<1>    drop,
+                                    bit<1>    notify_cp,
+                                    bit<16>   tunnel_src_port,
+                                    bit<32>   tunnel_src_addr,
+                                    bit<32>   tunnel_dst_addr,
+                                    teid_t    teid) {
+        load_tunnel_far_attributes(drop, notify_cp, tunnel_src_port,
+                                   tunnel_src_addr, tunnel_dst_addr, teid);
+        fabric_md.spgw.skip_egress_pdr_ctr = _TRUE;
+    }
+
     table far_lookup {
         key = {
             fabric_md.spgw.far_id : exact @name("far_id");
@@ -167,74 +253,13 @@
         actions = {
             load_normal_far_attributes;
             load_tunnel_far_attributes;
+            load_dbuf_far_attributes;
         }
         // default is drop and don't notify CP
-        const default_action = load_normal_far_attributes(1, 1);
+        const default_action = load_normal_far_attributes(1, 0);
         size = MAX_FARS;
     }
 
-    //=============================//
-    //===== Misc Things ======//
-    //=============================//
-    
-    counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
-
-
-    @hidden
-    action decap_inner_common() {
-        // Correct parser-set metadata to use the inner header values
-        fabric_md.ip_eth_type   = ETHERTYPE_IPV4;
-        fabric_md.ip_proto      = hdr.inner_ipv4.protocol;
-        fabric_md.ipv4_src_addr = hdr.inner_ipv4.src_addr;
-        fabric_md.ipv4_dst_addr = hdr.inner_ipv4.dst_addr;
-        fabric_md.l4_sport      = fabric_md.inner_l4_sport;
-        fabric_md.l4_dport      = fabric_md.inner_l4_dport;
-        // Move GTPU and inner L3 headers out
-        hdr.ipv4 = hdr.inner_ipv4;
-        hdr.inner_ipv4.setInvalid();
-        hdr.gtpu.setInvalid();
-    }
-    action decap_inner_tcp() {
-        decap_inner_common();
-        hdr.udp.setInvalid();
-        hdr.tcp = hdr.inner_tcp;
-        hdr.inner_tcp.setInvalid();
-    }
-    action decap_inner_udp() {
-        decap_inner_common();
-        hdr.udp = hdr.inner_udp;
-        hdr.inner_udp.setInvalid();
-    }
-    action decap_inner_icmp() {
-        decap_inner_common();
-        hdr.udp.setInvalid();
-        hdr.icmp = hdr.inner_icmp;
-        hdr.inner_icmp.setInvalid();
-    }
-    action decap_inner_unknown() {
-        decap_inner_common();
-        hdr.udp.setInvalid();
-    }
-    @hidden
-    table decap_gtpu {
-        key = {
-            hdr.inner_tcp.isValid()     : exact;
-            hdr.inner_udp.isValid()     : exact;
-            hdr.inner_icmp.isValid()    : exact;
-        }
-        actions = {
-            decap_inner_tcp;
-            decap_inner_udp;
-            decap_inner_icmp;
-            decap_inner_unknown;
-        }
-        const default_action = decap_inner_unknown;
-        const entries = {
-            (true,  false, false) : decap_inner_tcp();
-            (false, true,  false) : decap_inner_udp();
-            (false, false, true)  : decap_inner_icmp();
-        }
-    }
 
 
     //=============================//
@@ -243,50 +268,36 @@
     apply {
 
         // Interfaces
-        interface_lookup.apply();
+        if (interface_lookup.apply().hit) {
+            if (fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF) {
+                decap_gtpu_from_dbuf.apply(hdr, fabric_md);
+            }
+            // PDRs
+            if (hdr.gtpu.isValid()) {
+                uplink_pdr_lookup.apply();
+            } else {
+                downlink_pdr_lookup.apply();
+            }
+            if (fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF) {
+                pdr_counter.count(fabric_md.spgw.ctr_id);
+            }
 
-        // If interface table missed, or the interface skips PDRs/FARs (TODO: is that a thing?)
-        if (fabric_md.spgw.skip_spgw == _TRUE) return;
+            // GTPU Decapsulate
+            if (fabric_md.spgw.needs_gtpu_decap == _TRUE) { 
+                decap_gtpu.apply(hdr, fabric_md);
+            }
 
-        // PDRs
-        // Currently only best-case PDR tables to make v1model-to-tofino compiler happy
-        if (hdr.gtpu.isValid()) {
-            uplink_pdr_lookup.apply();
-        } else {
-            downlink_pdr_lookup.apply();
+            // FARs
+            // Load FAR info
+            far_lookup.apply();
+
+            // Nothing to be done immediately for forwarding or encapsulation.
+            // Forwarding is done by other parts of fabric.p4, and
+            // encapsulation is done in the egress
+
+            // Needed for correct GTPU encapsulation in egress
+            fabric_md.spgw.ipv4_len = hdr.ipv4.total_len;
         }
-        // Inefficient PDR table if efficient tables missed
-        // Removed to make v1model-to-tofino compiler happy. Not removed in TNA port
-        //if (fabric_md.spgw.pdr_hit == _FALSE) {
-        //    flexible_pdr_lookup.apply();
-        //}
-        pdr_counter.count(fabric_md.spgw.ctr_id);
-
-        // GTPU Decapsulate
-        if (fabric_md.spgw.needs_gtpu_decap == _TRUE) { 
-            decap_gtpu.apply();
-        }
-
-        // FARs
-        // Load FAR info
-        far_lookup.apply();
-
-        if (fabric_md.spgw.notify_spgwc == _TRUE) {
-            // TODO: cpu clone action here
-        }
-        if (fabric_md.spgw.far_dropped == _TRUE) {
-            // Do dropping in the same way as fabric's filtering.p4, so we can traverse
-            // the ACL table, which is good for cases like DHCP.
-            fabric_md.skip_forwarding = _TRUE;
-            fabric_md.skip_next = _TRUE;
-        }
-
-        // Nothing to be done immediately for forwarding or encapsulation.
-        // Forwarding is done by other parts of fabric.p4, and
-        // encapsulation is done in the egress
-
-        // Needed for correct GTPU encapsulation in egress
-        fabric_md.spgw.ipv4_len = hdr.ipv4.total_len;
     }
 }
 
@@ -340,11 +351,13 @@
     }
 
     apply {
-        if (fabric_md.spgw.skip_spgw == _TRUE) return;
-        pdr_counter.count(fabric_md.spgw.ctr_id);
-
-        if (fabric_md.spgw.needs_gtpu_encap == _TRUE) {
-            gtpu_encap();
+        if (fabric_md.spgw.skip_spgw == _FALSE) {
+            if (fabric_md.spgw.needs_gtpu_encap == _TRUE) {
+                gtpu_encap();
+            }
+            if (fabric_md.spgw.skip_egress_pdr_ctr == _FALSE) {
+                pdr_counter.count(fabric_md.spgw.ctr_id);
+            }
         }
     }
 }
diff --git a/pipelines/fabric/impl/src/main/resources/include/define.p4 b/pipelines/fabric/impl/src/main/resources/include/define.p4
index bfb7b44..41d518e 100644
--- a/pipelines/fabric/impl/src/main/resources/include/define.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/define.p4
@@ -108,6 +108,7 @@
 const spgw_interface_t SPGW_IFACE_UNKNOWN = 8w0;
 const spgw_interface_t SPGW_IFACE_ACCESS = 8w1;
 const spgw_interface_t SPGW_IFACE_CORE = 8w2;
+const spgw_interface_t SPGW_IFACE_FROM_DBUF = 8w3;
 const direction_t SPGW_DIR_UNKNOWN = 2w0;
 const direction_t SPGW_DIR_UPLINK = 2w1;
 const direction_t SPGW_DIR_DOWNLINK = 2w2;
diff --git a/pipelines/fabric/impl/src/main/resources/include/header.p4 b/pipelines/fabric/impl/src/main/resources/include/header.p4
index 17b36fe..9af8732 100644
--- a/pipelines/fabric/impl/src/main/resources/include/header.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/header.p4
@@ -154,6 +154,7 @@
     _BOOL             notify_spgwc;
     _BOOL             needs_gtpu_encap;
     _BOOL             needs_gtpu_decap;
+    _BOOL             skip_egress_pdr_ctr;
 }
 #endif // WITH_SPGW
 
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index 5e458c2..4efd656 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -1435,7 +1435,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 164,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -1476,7 +1476,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 129,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -1541,7 +1541,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 166,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -1605,7 +1605,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 166,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2963,7 +2963,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 164,
+            "line" : 165,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -3200,7 +3200,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 133,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -3371,7 +3371,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 135,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -3529,7 +3529,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 127,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -3608,7 +3608,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3706,7 +3706,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3823,7 +3823,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3842,7 +3842,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 560e3e9..c991613 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -5,19 +5,18 @@
       "id" : 0,
       "fields" : [
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
+        ["tmp_2", 16, false],
+        ["tmp_3", 4, false],
         ["tmp", 32, false],
-        ["tmp_3", 32, false],
+        ["tmp_0", 32, false],
         ["tmp_4", 32, false],
         ["bng_ingress_upstream_tmp", 1, false],
         ["bng_ingress_downstream_tmp", 1, false],
-        ["spgw_ingress_hasReturned", 1, false],
+        ["spgw_ingress_tmp", 1, false],
         ["bng_ingress_upstream_hasReturned", 1, false],
         ["key_0", 64, false],
         ["egress_next_tmp", 1, false],
-        ["spgw_egress_hasReturned", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
         ["fabric_metadata_t._ip_eth_type0", 16, false],
         ["fabric_metadata_t._vlan_id1", 12, false],
@@ -57,20 +56,21 @@
         ["fabric_metadata_t._spgw_notify_spgwc35", 1, false],
         ["fabric_metadata_t._spgw_needs_gtpu_encap36", 1, false],
         ["fabric_metadata_t._spgw_needs_gtpu_decap37", 1, false],
-        ["fabric_metadata_t._bng_type38", 2, false],
-        ["fabric_metadata_t._bng_line_id39", 32, false],
-        ["fabric_metadata_t._bng_pppoe_session_id40", 16, false],
-        ["fabric_metadata_t._bng_ds_meter_result41", 32, false],
-        ["fabric_metadata_t._bng_s_tag42", 12, false],
-        ["fabric_metadata_t._bng_c_tag43", 12, false],
-        ["fabric_metadata_t._int_meta_source44", 1, false],
-        ["fabric_metadata_t._int_meta_transit45", 1, false],
-        ["fabric_metadata_t._int_meta_sink46", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id47", 32, false],
-        ["fabric_metadata_t._int_meta_new_words48", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes49", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp50", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp51", 32, false],
+        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr38", 1, false],
+        ["fabric_metadata_t._bng_type39", 2, false],
+        ["fabric_metadata_t._bng_line_id40", 32, false],
+        ["fabric_metadata_t._bng_pppoe_session_id41", 16, false],
+        ["fabric_metadata_t._bng_ds_meter_result42", 32, false],
+        ["fabric_metadata_t._bng_s_tag43", 12, false],
+        ["fabric_metadata_t._bng_c_tag44", 12, false],
+        ["fabric_metadata_t._int_meta_source45", 1, false],
+        ["fabric_metadata_t._int_meta_transit46", 1, false],
+        ["fabric_metadata_t._int_meta_sink47", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id48", 32, false],
+        ["fabric_metadata_t._int_meta_new_words49", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes50", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp51", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp52", 32, false],
         ["_padding_0", 6, false]
       ]
     },
@@ -802,7 +802,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -840,7 +840,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -861,7 +861,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag43"]
                 },
                 {
                   "type" : "field",
@@ -874,7 +874,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -900,7 +900,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -921,7 +921,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag44"]
                 },
                 {
                   "type" : "field",
@@ -1087,7 +1087,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -1119,7 +1119,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -2022,7 +2022,7 @@
       "id" : 19,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 180,
+        "line" : 109,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2070,7 +2070,7 @@
       "id" : 23,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 301,
+        "line" : 312,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2146,7 +2146,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 375,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -2354,7 +2354,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source44"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source45"]
             },
             {
               "type" : "expression",
@@ -2390,7 +2390,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink47"]
             },
             {
               "type" : "expression",
@@ -2468,7 +2468,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -2490,7 +2490,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type39"]
             },
             {
               "type" : "hexstr",
@@ -2499,7 +2499,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 164,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2531,7 +2531,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type39"]
             },
             {
               "type" : "hexstr",
@@ -2540,7 +2540,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 164,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2581,7 +2581,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 129,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2610,7 +2610,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -2641,7 +2641,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 130,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -2670,7 +2670,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -2697,7 +2697,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type39"]
             },
             {
               "type" : "hexstr",
@@ -2706,7 +2706,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 166,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2716,7 +2716,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id41"]
             },
             {
               "type" : "runtime_data",
@@ -2739,7 +2739,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -2761,7 +2761,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type39"]
             },
             {
               "type" : "hexstr",
@@ -2770,7 +2770,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 166,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2784,7 +2784,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -2850,7 +2850,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             },
             {
               "type" : "runtime_data",
@@ -3439,7 +3439,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
+              "value" : ["scalars", "fabric_metadata_t._bng_s_tag43"]
             },
             {
               "type" : "runtime_data",
@@ -3458,7 +3458,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
+              "value" : ["scalars", "fabric_metadata_t._bng_c_tag44"]
             },
             {
               "type" : "runtime_data",
@@ -4013,8 +4013,1662 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_source_iface",
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp",
       "id" : 52,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp",
+      "id" : 53,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "id" : 54,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "id" : 55,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp",
+      "id" : 56,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp",
+      "id" : 58,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown",
+      "id" : 59,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.set_source_iface",
+      "id" : 60,
       "runtime_data" : [
         {
           "name" : "src_iface",
@@ -4044,7 +5698,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 50,
+            "line" : 123,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -4063,7 +5717,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 51,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "= direction; ..."
           }
@@ -4102,7 +5756,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 52,
+            "line" : 125,
             "column" : 33,
             "source_fragment" : "= (bool)skip_spgw; ..."
           }
@@ -4111,7 +5765,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 53,
+      "id" : 61,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -4151,7 +5805,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 75,
+            "line" : 148,
             "column" : 31,
             "source_fragment" : "= true; ..."
           }
@@ -4170,7 +5824,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 149,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4189,7 +5843,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4228,7 +5882,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4237,7 +5891,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 54,
+      "id" : 62,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -4277,7 +5931,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 75,
+            "line" : 148,
             "column" : 31,
             "source_fragment" : "= true; ..."
           }
@@ -4296,7 +5950,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 149,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4315,7 +5969,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4354,7 +6008,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4363,7 +6017,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 55,
+      "id" : 63,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -4380,7 +6034,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -4409,8 +6063,47 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 138,
-            "column" : 35,
+            "line" : 211,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 212,
+            "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -4448,7 +6141,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 139,
+            "line" : 213,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4457,7 +6150,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 56,
+      "id" : 64,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -4490,7 +6183,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -4519,8 +6212,47 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 148,
-            "column" : 35,
+            "line" : 222,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 223,
+            "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -4558,7 +6290,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 149,
+            "line" : 224,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4587,7 +6319,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 226,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -4606,7 +6338,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 227,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -4625,7 +6357,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 228,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4644,7 +6376,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 229,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4663,7 +6395,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 230,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4682,7 +6414,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 232,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4701,7 +6433,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 158,
+            "line" : 233,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4720,7 +6452,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 234,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4739,7 +6471,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 235,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -4747,246 +6479,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
-      "id" : 57,
-      "runtime_data" : [],
-      "primitives" : [
+      "name" : "FabricIngress.spgw_ingress.load_dbuf_far_attributes",
+      "id" : 65,
+      "runtime_data" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
+          "name" : "drop",
+          "bitwidth" : 1
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
-          }
+          "name" : "notify_cp",
+          "bitwidth" : 1
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
+          "name" : "tunnel_src_port",
+          "bitwidth" : 16
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 199,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "tcp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 200,
-            "column" : 8,
-            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 201,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_tcp.setInvalid()"
-          }
+          "name" : "teid",
+          "bitwidth" : 32
         }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_udp",
-      "id" : 58,
-      "runtime_data" : [],
+      ],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 222,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -4994,18 +6552,182 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 223,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc35"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 224,
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 226,
+            "column" : 40,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 5
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 227,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port26"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 228,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr27"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 229,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr28"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 230,
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -5016,15 +6738,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
+            "line" : 232,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -5035,15 +6757,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 233,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -5054,15 +6776,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 234,
             "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -5073,143 +6795,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 205,
-            "column" : 8,
-            "source_fragment" : "hdr.udp = hdr.inner_udp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 206,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_udp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_icmp",
-      "id" : 59,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
               "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "value" : "0x0868"
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
+            "line" : 235,
             "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "source_fragment" : "= 2152; ..."
           }
         },
         {
@@ -5217,365 +6811,35 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr38"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 210,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "icmp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 211,
-            "column" : 8,
-            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 212,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_icmp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_unknown",
-      "id" : 60,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 216,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "line" : 246,
+            "column" : 43,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 61,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5655,7 +6919,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 62,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5663,7 +6927,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 68,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -5684,44 +6978,8 @@
       ]
     },
     {
-      "name" : "act_1",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_2",
-      "id" : 64,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5738,8 +6996,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
+            "line" : 282,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -5747,72 +7005,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 65,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 281,
-            "column" : 32,
-            "source_fragment" : "= true; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 66,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5829,16 +7022,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 299,
+            "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 67,
+      "name" : "act_4",
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5901,8 +7094,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 68,
+      "name" : "act_5",
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5965,8 +7158,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 69,
+      "name" : "act_6",
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5991,8 +7184,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 70,
+      "name" : "act_7",
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6000,7 +7193,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -6036,7 +7229,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
@@ -6049,8 +7242,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 71,
+      "name" : "act_8",
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6107,8 +7300,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 72,
+      "name" : "act_9",
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6133,8 +7326,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 73,
+      "name" : "act_10",
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6163,8 +7356,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 74,
+      "name" : "act_11",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6193,8 +7386,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 75,
+      "name" : "act_12",
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6202,7 +7395,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type39"]
             },
             {
               "type" : "hexstr",
@@ -6211,7 +7404,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 164,
+            "line" : 165,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -6242,8 +7435,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 76,
+      "name" : "act_13",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6278,8 +7471,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 77,
+      "name" : "act_14",
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6291,7 +7484,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -6304,8 +7497,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 78,
+      "name" : "act_15",
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6317,7 +7510,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -6330,8 +7523,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 79,
+      "name" : "act_16",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6389,8 +7582,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 80,
+      "name" : "act_17",
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6419,8 +7612,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 81,
+      "name" : "act_18",
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6449,8 +7642,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 82,
+      "name" : "act_19",
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6462,11 +7655,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result42"]
             }
           ],
           "source_info" : {
@@ -6479,8 +7672,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 83,
+      "name" : "act_20",
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6492,11 +7685,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result42"]
             }
           ],
           "source_info" : {
@@ -6509,8 +7702,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 84,
+      "name" : "act_21",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6522,11 +7715,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result42"]
             }
           ],
           "source_info" : {
@@ -6539,8 +7732,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 85,
+      "name" : "act_22",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6552,11 +7745,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result42"]
             }
           ],
           "source_info" : {
@@ -6570,44 +7763,44 @@
     },
     {
       "name" : "nop",
-      "id" : 86,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 87,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 88,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 89,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
       "id" : 90,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 91,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricEgress.bng_egress.downstream.encap_v4",
+      "name" : "nop",
       "id" : 92,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 93,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 94,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 95,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.bng_egress.downstream.encap_v4",
+      "id" : 96,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
@@ -6623,7 +7816,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 133,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6709,7 +7902,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id41"]
             }
           ],
           "source_info" : {
@@ -6728,7 +7921,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -6794,7 +7987,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 135,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -6803,7 +7996,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v6",
-      "id" : 93,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6820,7 +8013,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 133,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6906,7 +8099,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id41"]
             }
           ],
           "source_info" : {
@@ -6925,7 +8118,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id40"]
             }
           ],
           "source_info" : {
@@ -6991,7 +8184,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 136,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -7000,7 +8193,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 94,
+      "id" : 98,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -7068,7 +8261,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 166,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -7486,7 +8679,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 161,
+            "line" : 162,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -7495,7 +8688,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 95,
+      "id" : 99,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -7508,7 +8701,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit45"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit46"]
             },
             {
               "type" : "expression",
@@ -7537,7 +8730,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
             },
             {
               "type" : "runtime_data",
@@ -7555,655 +8748,12 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 96,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 97,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 98,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 99,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 100,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
       "id" : 101,
       "runtime_data" : [],
       "primitives" : [
@@ -8274,90 +8824,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -8371,11 +8842,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -8389,9 +8860,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8399,7 +8870,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -8413,11 +8884,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -8431,15 +8902,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
       "id" : 102,
       "runtime_data" : [],
       "primitives" : [
@@ -8478,90 +8949,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -8575,11 +8967,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -8593,9 +8985,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8603,7 +8995,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -8617,11 +9009,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -8635,15 +9027,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
       "id" : 103,
       "runtime_data" : [],
       "primitives" : [
@@ -8748,6 +9140,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
+      "id" : 104,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -8831,7 +9314,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -8845,132 +9328,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 104,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8998,7 +9356,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -9012,7 +9370,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9038,7 +9396,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
       "id" : 105,
       "runtime_data" : [],
       "primitives" : [
@@ -9113,14 +9471,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
+              "value" : "int_port_ids"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 47,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
+            "source_fragment" : "hdr.int_port_ids.setValid()"
           }
         },
         {
@@ -9128,18 +9486,31 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
+              "value" : ["int_port_ids", "ingress_port_id"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 42,
+            "line" : 48,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
         },
         {
@@ -9147,7 +9518,39 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -9161,7 +9564,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9189,7 +9592,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -9203,7 +9606,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9229,7 +9632,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
       "id" : 106,
       "runtime_data" : [],
       "primitives" : [
@@ -9272,14 +9675,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
+              "value" : "int_port_ids"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 47,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
+            "source_fragment" : "hdr.int_port_ids.setValid()"
           }
         },
         {
@@ -9287,18 +9690,31 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
+              "value" : ["int_port_ids", "ingress_port_id"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 42,
+            "line" : 48,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
         },
         {
@@ -9306,7 +9722,39 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -9320,7 +9768,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9348,7 +9796,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -9362,7 +9810,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9388,7 +9836,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
       "id" : 107,
       "runtime_data" : [],
       "primitives" : [
@@ -9497,131 +9945,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 108,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_port_ids"
             }
           ],
@@ -9697,6 +10020,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
+      "id" : 108,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -9720,7 +10134,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
             }
           ],
           "source_info" : {
@@ -9735,7 +10149,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -9749,11 +10163,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -9767,9 +10181,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -9777,7 +10191,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -9791,11 +10205,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -9809,15 +10223,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
       "id" : 109,
       "runtime_data" : [],
       "primitives" : [
@@ -9892,85 +10306,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_switch_id"
             }
           ],
@@ -9990,7 +10325,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
             }
           ],
           "source_info" : {
@@ -10005,7 +10340,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -10019,11 +10354,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -10037,9 +10372,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10047,7 +10382,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -10061,11 +10396,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -10079,15 +10414,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
       "id" : 110,
       "runtime_data" : [],
       "primitives" : [
@@ -10130,85 +10465,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_switch_id"
             }
           ],
@@ -10228,7 +10484,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
             }
           ],
           "source_info" : {
@@ -10243,7 +10499,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -10257,11 +10513,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -10275,9 +10531,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10285,7 +10541,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -10299,11 +10555,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -10317,15 +10573,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
       "id" : 111,
       "runtime_data" : [],
       "primitives" : [
@@ -10434,6 +10690,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
+      "id" : 112,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_port_ids"
             }
           ],
@@ -10532,7 +10913,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
             }
           ],
           "source_info" : {
@@ -10547,7 +10928,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -10561,460 +10942,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x04"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 115,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0010"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 116,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 112,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 113,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 114,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 115,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11042,7 +10970,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -11056,7 +10984,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11082,8 +11010,8 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 116,
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11091,14 +11019,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
+              "value" : "int_q_occupancy"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 74,
+            "line" : 60,
             "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
         },
         {
@@ -11106,7 +11034,26 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
             },
             {
               "type" : "expression",
@@ -11115,22 +11062,12 @@
                 "value" : {
                   "op" : "&",
                   "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
                   },
                   "right" : {
                     "type" : "hexstr",
-                    "value" : "0xffffffff"
+                    "value" : "0xffffff"
                   }
                 }
               }
@@ -11138,9 +11075,24 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 63,
             "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
           }
         },
         {
@@ -11148,7 +11100,105 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -11162,11 +11212,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x01"
+                        "value" : "0x03"
                       }
                     }
                   },
@@ -11180,9 +11230,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 97,
+            "line" : 109,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -11190,7 +11240,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -11204,11 +11254,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0004"
+                        "value" : "0x000c"
                       }
                     }
                   },
@@ -11222,15 +11272,563 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 110,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "id" : 114,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
+      "id" : 115,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id48"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x04"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 115,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0010"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 116,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
+      "id" : 116,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
       "id" : 117,
       "runtime_data" : [],
       "primitives" : [
@@ -11269,26 +11867,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -11302,53 +11885,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -11362,9 +11903,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -11372,7 +11913,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -11386,11 +11927,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -11404,15 +11945,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
       "id" : 118,
       "runtime_data" : [],
       "primitives" : [
@@ -11470,26 +12011,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -11503,53 +12029,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -11563,9 +12047,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -11573,7 +12057,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -11587,11 +12071,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -11605,15 +12089,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
       "id" : 119,
       "runtime_data" : [],
       "primitives" : [
@@ -11705,6 +12189,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
+      "id" : 120,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -11766,7 +12341,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -11780,132 +12355,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 120,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11933,7 +12383,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -11947,7 +12397,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11973,7 +12423,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
       "id" : 121,
       "runtime_data" : [],
       "primitives" : [
@@ -12016,14 +12466,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
+              "value" : "int_egress_tstamp"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
         },
         {
@@ -12031,26 +12481,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
             },
             {
               "type" : "expression",
@@ -12064,7 +12495,49 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12092,7 +12565,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -12106,7 +12579,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12132,7 +12605,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
       "id" : 122,
       "runtime_data" : [],
       "primitives" : [
@@ -12194,14 +12667,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
+              "value" : "int_egress_tstamp"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
         },
         {
@@ -12209,26 +12682,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
             },
             {
               "type" : "expression",
@@ -12242,7 +12696,49 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12270,7 +12766,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -12284,7 +12780,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12310,7 +12806,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
       "id" : 123,
       "runtime_data" : [],
       "primitives" : [
@@ -12406,131 +12902,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 124,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_egress_tstamp"
             }
           ],
@@ -12584,6 +12955,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
+      "id" : 124,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -12622,7 +13084,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -12636,11 +13098,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -12654,9 +13116,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -12664,7 +13126,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -12678,11 +13140,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -12696,15 +13158,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
       "id" : 125,
       "runtime_data" : [],
       "primitives" : [
@@ -12747,63 +13209,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_ingress_tstamp"
             }
           ],
@@ -12838,7 +13243,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -12852,11 +13257,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -12870,9 +13275,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -12880,7 +13285,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -12894,11 +13299,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -12912,15 +13317,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
       "id" : 126,
       "runtime_data" : [],
       "primitives" : [
@@ -12982,63 +13387,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_ingress_tstamp"
             }
           ],
@@ -13073,7 +13421,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -13087,11 +13435,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -13105,9 +13453,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -13115,7 +13463,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -13129,11 +13477,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -13147,15 +13495,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
       "id" : 127,
       "runtime_data" : [],
       "primitives" : [
@@ -13251,6 +13599,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
+      "id" : 128,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_egress_tstamp"
             }
           ],
@@ -13342,7 +13815,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
             },
             {
               "type" : "expression",
@@ -13356,7 +13829,727 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
+      "id" : 129,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "id" : 130,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
+      "id" : 131,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13384,7 +14577,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
             },
             {
               "type" : "expression",
@@ -13398,7 +14591,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13425,7 +14618,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 128,
+      "id" : 132,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -13531,7 +14724,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 129,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -13759,7 +14952,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 141,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -13945,7 +15138,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 171,
+            "line" : 172,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -14040,7 +15233,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 175,
+            "line" : 176,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -14087,7 +15280,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 129,
+      "id" : 133,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14132,7 +15325,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 130,
+      "id" : 134,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14463,7 +15656,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 131,
+      "id" : 135,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14504,7 +15697,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 132,
+      "id" : 136,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14612,7 +15805,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 127,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -14621,7 +15814,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 133,
+      "id" : 137,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14691,7 +15884,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14719,7 +15912,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 134,
+      "id" : 138,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14789,7 +15982,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14817,7 +16010,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_inner_vlan",
-      "id" : 135,
+      "id" : 139,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14906,7 +16099,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14925,7 +16118,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14934,7 +16127,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 136,
+      "id" : 140,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14956,7 +16149,7 @@
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 137,
+      "id" : 141,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14969,7 +16162,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -14988,7 +16181,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -15007,7 +16200,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 144,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -15026,7 +16219,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -15045,7 +16238,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -15087,7 +16280,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -15106,7 +16299,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -15125,7 +16318,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -15144,7 +16337,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 326,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -15163,7 +16356,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 157,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -15182,7 +16375,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 141,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -15201,7 +16394,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 329,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -15220,7 +16413,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -15239,7 +16432,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -15254,7 +16447,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -15273,7 +16466,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 323,
+            "line" : 334,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -15292,7 +16485,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 335,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -15334,7 +16527,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 336,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -15353,7 +16546,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 338,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -15368,7 +16561,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 341,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -15387,7 +16580,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 342,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -15406,7 +16599,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 343,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -15425,7 +16618,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -15444,7 +16637,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 345,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -15463,7 +16656,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 346,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -15482,7 +16675,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 347,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -15501,7 +16694,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 348,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -15520,7 +16713,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 349,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -15539,7 +16732,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 350,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -15547,8 +16740,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 138,
+      "name" : "act_23",
+      "id" : 142,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15564,8 +16757,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 139,
+      "name" : "act_24",
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15615,8 +16808,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 140,
+      "name" : "act_25",
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15637,8 +16830,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 141,
+      "name" : "act_26",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15667,8 +16860,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 142,
+      "name" : "act_27",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15697,8 +16890,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 143,
+      "name" : "act_28",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15719,8 +16912,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 144,
+      "name" : "act_29",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15741,8 +16934,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 145,
+      "name" : "act_30",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15790,8 +16983,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 146,
+      "name" : "act_31",
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15812,8 +17005,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 147,
+      "name" : "act_32",
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15861,8 +17054,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 148,
+      "name" : "act_33",
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15883,8 +17076,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 149,
+      "name" : "act_34",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15932,74 +17125,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 150,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_37",
-      "id" : 151,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_38",
-      "id" : 152,
+      "name" : "act_35",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16016,16 +17143,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
+            "line" : 359,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
       ]
     },
     {
-      "name" : "act_39",
-      "id" : 153,
+      "name" : "act_36",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16054,8 +17181,8 @@
       ]
     },
     {
-      "name" : "act_40",
-      "id" : 154,
+      "name" : "act_37",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16090,8 +17217,8 @@
       ]
     },
     {
-      "name" : "act_41",
-      "id" : 155,
+      "name" : "act_38",
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16117,7 +17244,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       }
                     }
                   },
@@ -16139,8 +17266,8 @@
       ]
     },
     {
-      "name" : "act_42",
-      "id" : 156,
+      "name" : "act_39",
+      "id" : 158,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16188,8 +17315,8 @@
       ]
     },
     {
-      "name" : "act_43",
-      "id" : 157,
+      "name" : "act_40",
+      "id" : 159,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16215,7 +17342,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes50"]
                       }
                     }
                   },
@@ -16237,8 +17364,8 @@
       ]
     },
     {
-      "name" : "act_44",
-      "id" : 158,
+      "name" : "act_41",
+      "id" : 160,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16264,7 +17391,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words49"]
                       }
                     }
                   },
@@ -16314,37 +17441,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
+          "action_ids" : [66],
           "actions" : ["act"],
-          "base_default_next" : "tbl_act_0",
-          "next_tables" : {
-            "act" : "tbl_act_0"
-          },
-          "default_entry" : {
-            "action_id" : 61,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_0",
-          "id" : 1,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_0"],
           "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
           "next_tables" : {
-            "act_0" : "FabricIngress.spgw_ingress.interface_lookup"
+            "act" : "FabricIngress.spgw_ingress.interface_lookup"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 66,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16352,10 +17456,10 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.interface_lookup",
-          "id" : 2,
+          "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 55,
+            "line" : 128,
             "column" : 10,
             "source_fragment" : "interface_lookup"
           },
@@ -16379,28 +17483,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
+          "action_ids" : [60],
           "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
-          "base_default_next" : "node_6",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.spgw_ingress.set_source_iface" : "node_6"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : ["0x0", "0x0", "0x1"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
+          "name" : "tbl_act_0",
+          "id" : 2,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16408,132 +17507,48 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_8",
+          "action_ids" : [67],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "act_1" : "node_8"
+            "act_0" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 67,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "name" : "tbl_act_1",
+          "id" : 3,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [68],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 68,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 93,
-            "column" : 10,
-            "source_fragment" : "uplink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "teid",
-              "target" : ["gtpu", "teid"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 54,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 82,
-            "column" : 10,
-            "source_fragment" : "downlink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 53,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_2",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_13",
-          "next_tables" : {
-            "act_2" : "node_13"
-          },
-          "default_entry" : {
-            "action_id" : 64,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 75,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -16563,17 +17578,17 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57, 58, 59, 60],
-          "actions" : ["FabricIngress.spgw_ingress.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_inner_udp", "FabricIngress.spgw_ingress.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_inner_unknown"],
-          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "action_ids" : [52, 53, 54, 55],
+          "actions" : ["FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown"],
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16582,7 +17597,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 233,
+                "line" : 89,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -16601,7 +17616,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 57,
+                "action_id" : 52,
                 "action_data" : []
               },
               "priority" : 1
@@ -16609,7 +17624,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 234,
+                "line" : 90,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -16628,7 +17643,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 58,
+                "action_id" : 53,
                 "action_data" : []
               },
               "priority" : 2
@@ -16636,7 +17651,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 91,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -16655,7 +17670,248 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 54,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 166,
+            "column" : 10,
+            "source_fragment" : "uplink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "teid",
+              "target" : ["gtpu", "teid"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [62],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 62,
+            "action_const" : true,
+            "action_data" : ["0x0", "0x0", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 155,
+            "column" : 10,
+            "source_fragment" : "downlink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [61],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 61,
+            "action_const" : true,
+            "action_data" : ["0x0", "0x0", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 282,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [69],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_15",
+          "next_tables" : {
+            "act_2" : "node_15"
+          },
+          "default_entry" : {
+            "action_id" : 69,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 75,
+            "column" : 10,
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [56, 57, 58, 59],
+          "actions" : ["FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown"],
+          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+          },
+          "default_entry" : {
+            "action_id" : 59,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 89,
+                "column" : 12,
+                "source_fragment" : "(true, false, false) : decap_inner_tcp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 56,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 90,
+                "column" : 12,
+                "source_fragment" : "(false, true, false) : decap_inner_udp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 57,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "column" : 12,
+                "source_fragment" : "(false, false, true) : decap_inner_icmp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 58,
                 "action_data" : []
               },
               "priority" : 3
@@ -16664,10 +17920,10 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.far_lookup",
-          "id" : 8,
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 163,
+            "line" : 249,
             "column" : 10,
             "source_fragment" : "far_lookup"
           },
@@ -16685,56 +17941,28 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55, 56],
-          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
-          "base_default_next" : "node_16",
+          "action_ids" : [63, 64, 65],
+          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes", "FabricIngress.spgw_ingress.load_dbuf_far_attributes"],
+          "base_default_next" : "tbl_act_3",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_16",
-            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_16"
+            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "tbl_act_3",
+            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "tbl_act_3",
+            "FabricIngress.spgw_ingress.load_dbuf_far_attributes" : "tbl_act_3"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 63,
             "action_const" : true,
-            "action_data" : ["0x1", "0x1"],
+            "action_data" : ["0x1", "0x0"],
             "action_entry_const" : true
           }
         },
         {
           "name" : "tbl_act_3",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_3"],
-          "base_default_next" : "tbl_act_4",
-          "next_tables" : {
-            "act_3" : "tbl_act_4"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_4",
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 299,
+            "column" : 36,
             "source_fragment" : "="
           },
           "key" : [],
@@ -16744,21 +17972,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_4"],
+          "action_ids" : [70],
+          "actions" : ["act_3"],
           "base_default_next" : "node_19",
           "next_tables" : {
-            "act_4" : "node_19"
+            "act_3" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 66,
+            "action_id" : 70,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_4",
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -16773,21 +18001,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_5"],
+          "action_ids" : [71],
+          "actions" : ["act_4"],
           "base_default_next" : "node_21",
           "next_tables" : {
-            "act_5" : "node_21"
+            "act_4" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 67,
+            "action_id" : 71,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_act_5",
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -16802,21 +18030,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_6"],
+          "action_ids" : [72],
+          "actions" : ["act_5"],
           "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_23"
+            "act_5" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 72,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_act_6",
           "id" : 13,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -16831,14 +18059,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [69],
-          "actions" : ["act_7"],
+          "action_ids" : [73],
+          "actions" : ["act_6"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_7" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 69,
+            "action_id" : 73,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17408,7 +18636,7 @@
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_act_7",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -17423,21 +18651,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70],
-          "actions" : ["act_8"],
+          "action_ids" : [74],
+          "actions" : ["act_7"],
           "base_default_next" : "node_45",
           "next_tables" : {
-            "act_8" : "node_45"
+            "act_7" : "node_45"
           },
           "default_entry" : {
-            "action_id" : 70,
+            "action_id" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_act_8",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -17452,14 +18680,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["act_9"],
+          "action_ids" : [75],
+          "actions" : ["act_8"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_9" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_8" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 71,
+            "action_id" : 75,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17540,7 +18768,7 @@
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_act_9",
           "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -17555,14 +18783,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_10"],
+          "action_ids" : [76],
+          "actions" : ["act_9"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
-            "act_10" : "FabricIngress.bng_ingress.t_line_map"
+            "act_9" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
-            "action_id" : 72,
+            "action_id" : 76,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17581,13 +18809,13 @@
             {
               "match_type" : "exact",
               "name" : "s_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_s_tag42"],
+              "target" : ["scalars", "fabric_metadata_t._bng_s_tag43"],
               "mask" : null
             },
             {
               "match_type" : "exact",
               "name" : "c_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_c_tag43"],
+              "target" : ["scalars", "fabric_metadata_t._bng_c_tag44"],
               "mask" : null
             }
           ],
@@ -17611,7 +18839,7 @@
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act_10",
           "id" : 32,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17626,14 +18854,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["act_13"],
+          "action_ids" : [79],
+          "actions" : ["act_12"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
           "next_tables" : {
-            "act_13" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+            "act_12" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
           },
           "default_entry" : {
-            "action_id" : 75,
+            "action_id" : 79,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17672,8 +18900,8 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_12",
-            "__MISS__" : "tbl_act_13"
+            "__HIT__" : "tbl_act_11",
+            "__MISS__" : "tbl_act_12"
           },
           "default_entry" : {
             "action_id" : 2,
@@ -17683,7 +18911,7 @@
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_act_11",
           "id" : 34,
           "key" : [],
           "match_type" : "exact",
@@ -17692,21 +18920,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_11"],
+          "action_ids" : [77],
+          "actions" : ["act_10"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_11" : "node_57"
+            "act_10" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 73,
+            "action_id" : 77,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
+          "name" : "tbl_act_12",
           "id" : 35,
           "key" : [],
           "match_type" : "exact",
@@ -17715,21 +18943,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_12"],
+          "action_ids" : [78],
+          "actions" : ["act_11"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_12" : "node_57"
+            "act_11" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 74,
+            "action_id" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
+          "name" : "tbl_act_13",
           "id" : 36,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17744,14 +18972,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["act_14"],
+          "action_ids" : [80],
+          "actions" : ["act_13"],
           "base_default_next" : "node_59",
           "next_tables" : {
-            "act_14" : "node_59"
+            "act_13" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 80,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17770,7 +18998,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id40"],
               "mask" : null
             },
             {
@@ -17796,7 +19024,7 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_15",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_14",
             "FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
           },
           "default_entry" : {
@@ -17807,7 +19035,7 @@
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_act_14",
           "id" : 38,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17822,21 +19050,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77],
-          "actions" : ["act_15"],
+          "action_ids" : [81],
+          "actions" : ["act_14"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "act_14" : null
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 81,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_act_15",
           "id" : 39,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17851,14 +19079,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79],
-          "actions" : ["act_17"],
+          "action_ids" : [83],
+          "actions" : ["act_16"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
           "next_tables" : {
-            "act_17" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+            "act_16" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 83,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17877,7 +19105,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id40"],
               "mask" : null
             },
             {
@@ -17903,7 +19131,7 @@
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v6", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_17",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_16",
             "FabricIngress.bng_ingress.upstream.term_enabled_v6" : null
           },
           "default_entry" : {
@@ -17914,7 +19142,7 @@
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_16",
           "id" : 41,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17929,14 +19157,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [78],
-          "actions" : ["act_16"],
+          "action_ids" : [82],
+          "actions" : ["act_15"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_16" : null
+            "act_15" : null
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17955,7 +19183,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id40"],
               "mask" : null
             }
           ],
@@ -17969,8 +19197,8 @@
           "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_18",
-            "__MISS__" : "tbl_act_19"
+            "__HIT__" : "tbl_act_17",
+            "__MISS__" : "tbl_act_18"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -17980,7 +19208,7 @@
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "tbl_act_17",
           "id" : 43,
           "key" : [],
           "match_type" : "exact",
@@ -17989,21 +19217,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [80],
-          "actions" : ["act_18"],
+          "action_ids" : [84],
+          "actions" : ["act_17"],
           "base_default_next" : "node_70",
           "next_tables" : {
-            "act_18" : "node_70"
+            "act_17" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 80,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
+          "name" : "tbl_act_18",
           "id" : 44,
           "key" : [],
           "match_type" : "exact",
@@ -18012,14 +19240,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["act_19"],
+          "action_ids" : [85],
+          "actions" : ["act_18"],
           "base_default_next" : "node_70",
           "next_tables" : {
-            "act_19" : "node_70"
+            "act_18" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 81,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18038,7 +19266,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id40"],
               "mask" : null
             },
             {
@@ -18070,8 +19298,8 @@
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_20",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_21"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_19",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_20"
           },
           "default_entry" : {
             "action_id" : 24,
@@ -18081,7 +19309,7 @@
           }
         },
         {
-          "name" : "tbl_act_20",
+          "name" : "tbl_act_19",
           "id" : 46,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18096,21 +19324,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["act_20"],
+          "action_ids" : [86],
+          "actions" : ["act_19"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_20" : null
+            "act_19" : null
           },
           "default_entry" : {
-            "action_id" : 82,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
+          "name" : "tbl_act_20",
           "id" : 47,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18125,14 +19353,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["act_21"],
+          "action_ids" : [87],
+          "actions" : ["act_20"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_21" : null
+            "act_20" : null
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18151,7 +19379,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id40"],
               "mask" : null
             },
             {
@@ -18177,8 +19405,8 @@
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_22",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_23"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_21",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_22"
           },
           "default_entry" : {
             "action_id" : 25,
@@ -18188,7 +19416,7 @@
           }
         },
         {
-          "name" : "tbl_act_22",
+          "name" : "tbl_act_21",
           "id" : 49,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18203,21 +19431,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
-          "actions" : ["act_22"],
+          "action_ids" : [88],
+          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_22" : null
+            "act_21" : null
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_23",
+          "name" : "tbl_act_22",
           "id" : 50,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18232,14 +19460,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["act_23"],
+          "action_ids" : [89],
+          "actions" : ["act_22"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_23" : null
+            "act_22" : null
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18306,72 +19534,58 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "tbl_act_0"
+          "false_next" : "FabricIngress.spgw_ingress.interface_lookup"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "spgw_ingress_tmp"]
+              }
+            }
+          },
+          "true_next" : "node_8",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_8",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "line" : 272,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
               "op" : "==",
               "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw32"]
-                  }
-                }
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface31"]
               },
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "hexstr",
+                "value" : "0x03"
               }
             }
           },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_8"
+          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
+          "false_next" : "node_10"
         },
         {
-          "name" : "node_8",
-          "id" : 2,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_9",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_9",
+          "name" : "node_10",
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 253,
-            "column" : 12,
+            "line" : 276,
+            "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
           "expression" : {
@@ -18393,8 +19607,34 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
-            "column" : 12,
+            "line" : 281,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface31"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_15"
+        },
+        {
+          "name" : "node_15",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 286,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
           "expression" : {
@@ -18418,43 +19658,10 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu",
+          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
           "false_next" : "FabricIngress.spgw_ingress.far_lookup"
         },
         {
-          "name" : "node_16",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 277,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.far_dropped == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_3",
-          "false_next" : "tbl_act_4"
-        },
-        {
           "name" : "node_19",
           "id" : 6,
           "source_info" : {
@@ -18474,7 +19681,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_act_4",
           "false_next" : "node_21"
         },
         {
@@ -18497,7 +19704,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_act_5",
           "false_next" : "node_23"
         },
         {
@@ -18527,7 +19734,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_act_6",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -18723,7 +19930,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
+          "true_next" : "tbl_act_7",
           "false_next" : "node_45"
         },
         {
@@ -18749,7 +19956,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_act_8",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
@@ -18772,7 +19979,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink47"]
                   }
                 }
               },
@@ -18782,7 +19989,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_act_9",
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
@@ -18805,7 +20012,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_10",
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
@@ -18822,7 +20029,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_13",
           "false_next" : "node_59"
         },
         {
@@ -18893,7 +20100,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_16"
+          "true_next" : "tbl_act_15"
         },
         {
           "name" : "node_70",
@@ -18972,7 +20179,7 @@
       "init_table" : "node_81",
       "tables" : [
         {
-          "name" : "tbl_act_24",
+          "name" : "tbl_act_23",
           "id" : 51,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -18987,21 +20194,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [138],
-          "actions" : ["act_24"],
+          "action_ids" : [142],
+          "actions" : ["act_23"],
           "base_default_next" : "node_83",
           "next_tables" : {
-            "act_24" : "node_83"
+            "act_23" : "node_83"
           },
           "default_entry" : {
-            "action_id" : 138,
+            "action_id" : 142,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
+          "name" : "tbl_act_24",
           "id" : 52,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -19016,21 +20223,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [139],
-          "actions" : ["act_25"],
+          "action_ids" : [143],
+          "actions" : ["act_24"],
           "base_default_next" : "node_85",
           "next_tables" : {
-            "act_25" : "node_85"
+            "act_24" : "node_85"
           },
           "default_entry" : {
-            "action_id" : 139,
+            "action_id" : 143,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
+          "name" : "tbl_act_25",
           "id" : 53,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19045,14 +20252,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [140],
-          "actions" : ["act_26"],
+          "action_ids" : [144],
+          "actions" : ["act_25"],
           "base_default_next" : "node_87",
           "next_tables" : {
-            "act_26" : "node_87"
+            "act_25" : "node_87"
           },
           "default_entry" : {
-            "action_id" : 140,
+            "action_id" : 144,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19074,14 +20281,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [131],
+          "action_ids" : [135],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "node_91",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "node_91"
           },
           "default_entry" : {
-            "action_id" : 131,
+            "action_id" : 135,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19103,14 +20310,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [132],
+          "action_ids" : [136],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "node_91",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "node_91"
           },
           "default_entry" : {
-            "action_id" : 132,
+            "action_id" : 136,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19132,14 +20339,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [133],
+          "action_ids" : [137],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "tbl_egress_next_push_inner_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "tbl_egress_next_push_inner_vlan"
           },
           "default_entry" : {
-            "action_id" : 133,
+            "action_id" : 137,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19161,21 +20368,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [135],
+          "action_ids" : [139],
           "actions" : ["FabricEgress.egress_next.push_inner_vlan"],
           "base_default_next" : "node_101",
           "next_tables" : {
             "FabricEgress.egress_next.push_inner_vlan" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 135,
+            "action_id" : 139,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
+          "name" : "tbl_act_26",
           "id" : 58,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19190,14 +20397,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [143],
-          "actions" : ["act_29"],
+          "action_ids" : [147],
+          "actions" : ["act_28"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
-            "act_29" : "FabricEgress.egress_next.egress_vlan"
+            "act_28" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 143,
+            "action_id" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19232,22 +20439,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [136, 89],
+          "action_ids" : [140, 93],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_28",
-            "__MISS__" : "tbl_act_29"
+            "__HIT__" : "tbl_act_27",
+            "__MISS__" : "tbl_act_28"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
+          "name" : "tbl_act_27",
           "id" : 60,
           "key" : [],
           "match_type" : "exact",
@@ -19256,21 +20463,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [141],
-          "actions" : ["act_27"],
+          "action_ids" : [145],
+          "actions" : ["act_26"],
           "base_default_next" : "node_98",
           "next_tables" : {
-            "act_27" : "node_98"
+            "act_26" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 141,
+            "action_id" : 145,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_29",
+          "name" : "tbl_act_28",
           "id" : 61,
           "key" : [],
           "match_type" : "exact",
@@ -19279,14 +20486,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [142],
-          "actions" : ["act_28"],
+          "action_ids" : [146],
+          "actions" : ["act_27"],
           "base_default_next" : "node_98",
           "next_tables" : {
-            "act_28" : "node_98"
+            "act_27" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 142,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19308,21 +20515,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [134],
+          "action_ids" : [138],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "node_101",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 134,
+            "action_id" : 138,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
+          "name" : "tbl_act_29",
           "id" : 63,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19337,21 +20544,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [145],
-          "actions" : ["act_31"],
+          "action_ids" : [149],
+          "actions" : ["act_30"],
           "base_default_next" : "node_103",
           "next_tables" : {
-            "act_31" : "node_103"
+            "act_30" : "node_103"
           },
           "default_entry" : {
-            "action_id" : 145,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
+          "name" : "tbl_act_30",
           "id" : 64,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19366,21 +20573,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [144],
-          "actions" : ["act_30"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [148],
+          "actions" : ["act_29"],
+          "base_default_next" : "node_113",
           "next_tables" : {
-            "act_30" : "tbl_act_36"
+            "act_29" : "node_113"
           },
           "default_entry" : {
-            "action_id" : 144,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
+          "name" : "tbl_act_31",
           "id" : 65,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19395,21 +20602,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
-          "actions" : ["act_33"],
+          "action_ids" : [151],
+          "actions" : ["act_32"],
           "base_default_next" : "node_107",
           "next_tables" : {
-            "act_33" : "node_107"
+            "act_32" : "node_107"
           },
           "default_entry" : {
-            "action_id" : 147,
+            "action_id" : 151,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
+          "name" : "tbl_act_32",
           "id" : 66,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19424,21 +20631,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [146],
-          "actions" : ["act_32"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [150],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_113",
           "next_tables" : {
-            "act_32" : "tbl_act_36"
+            "act_31" : "node_113"
           },
           "default_entry" : {
-            "action_id" : 146,
+            "action_id" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_34",
+          "name" : "tbl_act_33",
           "id" : 67,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19453,21 +20660,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149],
-          "actions" : ["act_35"],
+          "action_ids" : [153],
+          "actions" : ["act_34"],
           "base_default_next" : "node_111",
           "next_tables" : {
-            "act_35" : "node_111"
+            "act_34" : "node_111"
           },
           "default_entry" : {
-            "action_id" : 149,
+            "action_id" : 153,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_35",
+          "name" : "tbl_act_34",
           "id" : 68,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19482,92 +20689,11 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
-          "actions" : ["act_34"],
-          "base_default_next" : "tbl_act_36",
-          "next_tables" : {
-            "act_34" : "tbl_act_36"
-          },
-          "default_entry" : {
-            "action_id" : 148,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_36",
-          "id" : 69,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [151],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_114",
-          "next_tables" : {
-            "act_37" : "node_114"
-          },
-          "default_entry" : {
-            "action_id" : 151,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_37",
-          "id" : 70,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [150],
-          "actions" : ["act_36"],
-          "base_default_next" : "node_116",
-          "next_tables" : {
-            "act_36" : "node_116"
-          },
-          "default_entry" : {
-            "action_id" : 150,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_38",
-          "id" : 71,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
           "action_ids" : [152],
-          "actions" : ["act_38"],
-          "base_default_next" : "node_118",
+          "actions" : ["act_33"],
+          "base_default_next" : "node_113",
           "next_tables" : {
-            "act_38" : "node_118"
+            "act_33" : "node_113"
           },
           "default_entry" : {
             "action_id" : 152,
@@ -19578,11 +20704,11 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 72,
+          "id" : 69,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 347,
-            "column" : 12,
+            "line" : 356,
+            "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -19592,14 +20718,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [137],
+          "action_ids" : [141],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_120",
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_120"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 137,
+            "action_id" : 141,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_35",
+          "id" : 70,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 359,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [154],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_118",
+          "next_tables" : {
+            "act_35" : "node_118"
+          },
+          "default_entry" : {
+            "action_id" : 154,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19607,7 +20762,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 73,
+          "id" : 71,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 297,
@@ -19621,14 +20776,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
+          "action_ids" : [96],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
-          "base_default_next" : "node_125",
+          "base_default_next" : "node_123",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v4" : "node_125"
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_123"
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 96,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19636,7 +20791,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v6",
-          "id" : 74,
+          "id" : 72,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 302,
@@ -19650,14 +20805,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
+          "action_ids" : [97],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v6"],
-          "base_default_next" : "node_125",
+          "base_default_next" : "node_123",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v6" : "node_125"
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_123"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19665,7 +20820,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 75,
+          "id" : 73,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -19704,23 +20859,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94, 86],
+          "action_ids" : [98, 90],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_128",
+          "base_default_next" : "node_126",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_128",
-            "nop" : "node_128"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_126",
+            "nop" : "node_126"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_39",
-          "id" : 76,
+          "name" : "tbl_act_36",
+          "id" : 74,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -19728,14 +20883,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
-          "actions" : ["act_39"],
+          "action_ids" : [155],
+          "actions" : ["act_36"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_39" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_36" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 153,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19743,7 +20898,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 77,
+          "id" : 75,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -19764,23 +20919,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95, 87],
+          "action_ids" : [99, 91],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_131",
+          "base_default_next" : "node_129",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_131",
-            "nop" : "node_131"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_129",
+            "nop" : "node_129"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_40",
-          "id" : 78,
+          "name" : "tbl_act_37",
+          "id" : 76,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -19794,14 +20949,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
-          "actions" : ["act_40"],
-          "base_default_next" : "node_133",
+          "action_ids" : [156],
+          "actions" : ["act_37"],
+          "base_default_next" : "node_131",
           "next_tables" : {
-            "act_40" : "node_133"
+            "act_37" : "node_131"
           },
           "default_entry" : {
-            "action_id" : 154,
+            "action_id" : 156,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19809,7 +20964,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 79,
+          "id" : 77,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -19830,7 +20985,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 90],
+          "action_ids" : [100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 94],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -19853,7 +21008,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 94,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -19873,7 +21028,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 100,
                 "action_data" : []
               },
               "priority" : 1
@@ -19892,7 +21047,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 101,
                 "action_data" : []
               },
               "priority" : 2
@@ -19911,7 +21066,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 102,
                 "action_data" : []
               },
               "priority" : 3
@@ -19930,7 +21085,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 103,
                 "action_data" : []
               },
               "priority" : 4
@@ -19949,7 +21104,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 104,
                 "action_data" : []
               },
               "priority" : 5
@@ -19968,7 +21123,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 105,
                 "action_data" : []
               },
               "priority" : 6
@@ -19987,7 +21142,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 106,
                 "action_data" : []
               },
               "priority" : 7
@@ -20006,7 +21161,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 103,
+                "action_id" : 107,
                 "action_data" : []
               },
               "priority" : 8
@@ -20025,7 +21180,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 108,
                 "action_data" : []
               },
               "priority" : 9
@@ -20044,7 +21199,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 109,
                 "action_data" : []
               },
               "priority" : 10
@@ -20063,7 +21218,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 110,
                 "action_data" : []
               },
               "priority" : 11
@@ -20082,7 +21237,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 111,
                 "action_data" : []
               },
               "priority" : 12
@@ -20101,7 +21256,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 112,
                 "action_data" : []
               },
               "priority" : 13
@@ -20120,7 +21275,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 14
@@ -20139,7 +21294,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 15
@@ -20158,7 +21313,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 16
@@ -20167,7 +21322,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 80,
+          "id" : 78,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -20188,30 +21343,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 91],
+          "action_ids" : [116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 95],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_41",
+          "base_default_next" : "tbl_act_38",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_41",
-            "NoAction" : "tbl_act_41"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_38",
+            "NoAction" : "tbl_act_38"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 95,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20231,7 +21386,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 1
@@ -20250,7 +21405,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 2
@@ -20269,7 +21424,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 3
@@ -20288,7 +21443,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 4
@@ -20307,7 +21462,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 5
@@ -20326,7 +21481,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 6
@@ -20345,7 +21500,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 118,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 7
@@ -20364,7 +21519,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 119,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 8
@@ -20383,7 +21538,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 120,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 9
@@ -20402,7 +21557,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 121,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 10
@@ -20421,7 +21576,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 122,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 11
@@ -20440,7 +21595,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 123,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 12
@@ -20459,7 +21614,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 124,
+                "action_id" : 128,
                 "action_data" : []
               },
               "priority" : 13
@@ -20478,7 +21633,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 125,
+                "action_id" : 129,
                 "action_data" : []
               },
               "priority" : 14
@@ -20497,7 +21652,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 126,
+                "action_id" : 130,
                 "action_data" : []
               },
               "priority" : 15
@@ -20516,7 +21671,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 127,
+                "action_id" : 131,
                 "action_data" : []
               },
               "priority" : 16
@@ -20524,8 +21679,8 @@
           ]
         },
         {
-          "name" : "tbl_act_41",
-          "id" : 81,
+          "name" : "tbl_act_38",
+          "id" : 79,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -20539,22 +21694,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
-          "actions" : ["act_42"],
-          "base_default_next" : "node_137",
+          "action_ids" : [158],
+          "actions" : ["act_39"],
+          "base_default_next" : "node_135",
           "next_tables" : {
-            "act_42" : "node_137"
+            "act_39" : "node_135"
           },
           "default_entry" : {
-            "action_id" : 156,
+            "action_id" : 158,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_42",
-          "id" : 82,
+          "name" : "tbl_act_39",
+          "id" : 80,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -20568,22 +21723,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
-          "actions" : ["act_41"],
-          "base_default_next" : "node_139",
+          "action_ids" : [157],
+          "actions" : ["act_38"],
+          "base_default_next" : "node_137",
           "next_tables" : {
-            "act_41" : "node_139"
+            "act_38" : "node_137"
           },
           "default_entry" : {
-            "action_id" : 155,
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_43",
-          "id" : 83,
+          "name" : "tbl_act_40",
+          "id" : 81,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -20597,22 +21752,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [157],
-          "actions" : ["act_43"],
-          "base_default_next" : "node_141",
+          "action_ids" : [159],
+          "actions" : ["act_40"],
+          "base_default_next" : "node_139",
           "next_tables" : {
-            "act_43" : "node_141"
+            "act_40" : "node_139"
           },
           "default_entry" : {
-            "action_id" : 157,
+            "action_id" : 159,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_44",
-          "id" : 84,
+          "name" : "tbl_act_41",
+          "id" : 82,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -20626,14 +21781,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["act_44"],
-          "base_default_next" : "node_143",
+          "action_ids" : [160],
+          "actions" : ["act_41"],
+          "base_default_next" : "node_141",
           "next_tables" : {
-            "act_44" : "node_143"
+            "act_41" : "node_141"
           },
           "default_entry" : {
-            "action_id" : 158,
+            "action_id" : 160,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20641,7 +21796,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 85,
+          "id" : 83,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 87,
@@ -20655,15 +21810,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [128, 88],
+          "action_ids" : [132, 92],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_145",
+          "base_default_next" : "node_143",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_145",
-            "nop" : "node_145"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_143",
+            "nop" : "node_143"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 92,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20671,7 +21826,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 86,
+          "id" : 84,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -20685,14 +21840,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [129],
+          "action_ids" : [133],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
           "base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
           },
           "default_entry" : {
-            "action_id" : 129,
+            "action_id" : 133,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20700,7 +21855,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 87,
+          "id" : 85,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -20714,14 +21869,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [130],
+          "action_ids" : [134],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 130,
+            "action_id" : 134,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20760,7 +21915,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
+          "true_next" : "tbl_act_23",
           "false_next" : "node_83"
         },
         {
@@ -20786,7 +21941,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
+          "true_next" : "tbl_act_24",
           "false_next" : "node_85"
         },
         {
@@ -20839,7 +21994,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_26",
+          "true_next" : "tbl_act_25",
           "false_next" : "node_87"
         },
         {
@@ -20922,7 +22077,7 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "tbl_act_27"
+          "false_next" : "tbl_act_26"
         },
         {
           "name" : "node_98",
@@ -21000,7 +22155,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_30",
+          "true_next" : "tbl_act_29",
           "false_next" : "node_105"
         },
         {
@@ -21026,8 +22181,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_31",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_30",
+          "false_next" : "node_113"
         },
         {
           "name" : "node_105",
@@ -21069,7 +22224,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_32",
+          "true_next" : "tbl_act_31",
           "false_next" : "node_109"
         },
         {
@@ -21095,8 +22250,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_113"
         },
         {
           "name" : "node_109",
@@ -21138,8 +22293,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_34",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_33",
+          "false_next" : "node_113"
         },
         {
           "name" : "node_111",
@@ -21164,17 +22319,17 @@
               }
             }
           },
-          "true_next" : "tbl_act_35",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_34",
+          "false_next" : "node_113"
         },
         {
-          "name" : "node_114",
+          "name" : "node_113",
           "id" : 40,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 354,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
           },
           "expression" : {
             "type" : "expression",
@@ -21193,44 +22348,20 @@
               },
               "right" : {
                 "type" : "bool",
-                "value" : true
+                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_116"
+          "true_next" : "node_114",
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_116",
+          "name" : "node_114",
           "id" : 41,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_egress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_38",
-          "false_next" : "node_120"
-        },
-        {
-          "name" : "node_118",
-          "id" : 42,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
-            "column" : 12,
+            "line" : 355,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
           "expression" : {
@@ -21255,10 +22386,43 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_120"
+          "false_next" : "node_116"
         },
         {
-          "name" : "node_120",
+          "name" : "node_116",
+          "id" : 42,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 358,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr38"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "tbl_act_35",
+          "false_next" : "node_118"
+        },
+        {
+          "name" : "node_118",
           "id" : 43,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -21272,7 +22436,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+                "value" : ["scalars", "fabric_metadata_t._bng_type39"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -21280,11 +22444,11 @@
               }
             }
           },
-          "true_next" : "node_121",
-          "false_next" : "node_125"
+          "true_next" : "node_119",
+          "false_next" : "node_123"
         },
         {
-          "name" : "node_121",
+          "name" : "node_119",
           "id" : 44,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -21304,10 +22468,10 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v4",
-          "false_next" : "node_123"
+          "false_next" : "node_121"
         },
         {
-          "name" : "node_123",
+          "name" : "node_121",
           "id" : 45,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -21327,10 +22491,10 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v6",
-          "false_next" : "node_125"
+          "false_next" : "node_123"
         },
         {
-          "name" : "node_125",
+          "name" : "node_123",
           "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21407,10 +22571,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_126"
+          "true_next" : "node_124"
         },
         {
-          "name" : "node_126",
+          "name" : "node_124",
           "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21429,7 +22593,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source44"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source45"]
                   }
                 }
               },
@@ -21440,10 +22604,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_128"
+          "false_next" : "node_126"
         },
         {
-          "name" : "node_128",
+          "name" : "node_126",
           "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21463,10 +22627,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_39"
+          "true_next" : "tbl_act_36"
         },
         {
-          "name" : "node_131",
+          "name" : "node_129",
           "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21485,7 +22649,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit45"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit46"]
                   }
                 }
               },
@@ -21495,11 +22659,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_40",
-          "false_next" : "node_133"
+          "true_next" : "tbl_act_37",
+          "false_next" : "node_131"
         },
         {
-          "name" : "node_133",
+          "name" : "node_131",
           "id" : 50,
           "expression" : {
             "type" : "expression",
@@ -21520,10 +22684,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_143"
+          "false_next" : "node_141"
         },
         {
-          "name" : "node_137",
+          "name" : "node_135",
           "id" : 51,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21542,11 +22706,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_42",
-          "false_next" : "node_139"
+          "true_next" : "tbl_act_39",
+          "false_next" : "node_137"
         },
         {
-          "name" : "node_139",
+          "name" : "node_137",
           "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21565,11 +22729,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_43",
-          "false_next" : "node_141"
+          "true_next" : "tbl_act_40",
+          "false_next" : "node_139"
         },
         {
-          "name" : "node_141",
+          "name" : "node_139",
           "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21588,11 +22752,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_44",
-          "false_next" : "node_143"
+          "true_next" : "tbl_act_41",
+          "false_next" : "node_141"
         },
         {
-          "name" : "node_143",
+          "name" : "node_141",
           "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21615,10 +22779,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_145"
+          "false_next" : "node_143"
         },
         {
-          "name" : "node_145",
+          "name" : "node_143",
           "id" : 55,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21637,7 +22801,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink47"]
                   }
                 }
               },
@@ -21685,7 +22849,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 375,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 1d379f5..2776667 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -779,6 +779,9 @@
   action_refs {
     id: 16787606
   }
+  action_refs {
+    id: 16801146
+  }
   const_default_action_id: 16834935
   size: 2048
 }
@@ -1412,30 +1415,39 @@
 }
 actions {
   preamble {
-    id: 16829280
-    name: "FabricIngress.spgw_ingress.decap_inner_tcp"
-    alias: "decap_inner_tcp"
+    id: 16801146
+    name: "FabricIngress.spgw_ingress.load_dbuf_far_attributes"
+    alias: "load_dbuf_far_attributes"
   }
-}
-actions {
-  preamble {
-    id: 16815878
-    name: "FabricIngress.spgw_ingress.decap_inner_udp"
-    alias: "decap_inner_udp"
+  params {
+    id: 1
+    name: "drop"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16801274
-    name: "FabricIngress.spgw_ingress.decap_inner_icmp"
-    alias: "decap_inner_icmp"
+  params {
+    id: 2
+    name: "notify_cp"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16830582
-    name: "FabricIngress.spgw_ingress.decap_inner_unknown"
-    alias: "decap_inner_unknown"
+  params {
+    id: 3
+    name: "tunnel_src_port"
+    bitwidth: 16
+  }
+  params {
+    id: 4
+    name: "tunnel_src_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 5
+    name: "tunnel_dst_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 6
+    name: "teid"
+    bitwidth: 32
   }
 }
 actions {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index e2d828c..d5726d0 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -2698,7 +2698,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 166,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -3116,7 +3116,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 161,
+            "line" : 162,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -9204,7 +9204,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 127,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -9283,7 +9283,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 656ae22..a7d99d5 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -5,14 +5,13 @@
       "id" : 0,
       "fields" : [
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
+        ["tmp_2", 16, false],
+        ["tmp_3", 4, false],
         ["tmp", 32, false],
-        ["tmp_3", 32, false],
-        ["spgw_ingress_hasReturned", 1, false],
+        ["tmp_0", 32, false],
+        ["spgw_ingress_tmp", 1, false],
         ["egress_next_tmp", 1, false],
-        ["spgw_egress_hasReturned", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
         ["fabric_metadata_t._ip_eth_type0", 16, false],
         ["fabric_metadata_t._vlan_id1", 12, false],
@@ -48,14 +47,15 @@
         ["fabric_metadata_t._spgw_notify_spgwc31", 1, false],
         ["fabric_metadata_t._spgw_needs_gtpu_encap32", 1, false],
         ["fabric_metadata_t._spgw_needs_gtpu_decap33", 1, false],
-        ["fabric_metadata_t._int_meta_source34", 1, false],
-        ["fabric_metadata_t._int_meta_transit35", 1, false],
-        ["fabric_metadata_t._int_meta_sink36", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id37", 32, false],
-        ["fabric_metadata_t._int_meta_new_words38", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes39", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp40", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp41", 32, false],
+        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr34", 1, false],
+        ["fabric_metadata_t._int_meta_source35", 1, false],
+        ["fabric_metadata_t._int_meta_transit36", 1, false],
+        ["fabric_metadata_t._int_meta_sink37", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id38", 32, false],
+        ["fabric_metadata_t._int_meta_new_words39", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes40", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp41", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp42", 32, false],
         ["_padding_0", 4, false]
       ]
     },
@@ -652,7 +652,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -690,7 +690,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -711,7 +711,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -737,7 +737,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -847,7 +847,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -873,7 +873,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -1508,7 +1508,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 180,
+        "line" : 109,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1544,7 +1544,7 @@
       "id" : 15,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 301,
+        "line" : 312,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1620,7 +1620,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 375,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1798,7 +1798,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source34"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source35"]
             },
             {
               "type" : "expression",
@@ -2611,8 +2611,1662 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_source_iface",
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp",
       "id" : 29,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp",
+      "id" : 30,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "id" : 31,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "id" : 32,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp",
+      "id" : 33,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp",
+      "id" : 34,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp",
+      "id" : 35,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown",
+      "id" : 36,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.set_source_iface",
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "src_iface",
@@ -2642,7 +4296,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 50,
+            "line" : 123,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -2661,7 +4315,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 51,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "= direction; ..."
           }
@@ -2700,7 +4354,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 52,
+            "line" : 125,
             "column" : 33,
             "source_fragment" : "= (bool)skip_spgw; ..."
           }
@@ -2709,7 +4363,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 30,
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2749,7 +4403,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 75,
+            "line" : 148,
             "column" : 31,
             "source_fragment" : "= true; ..."
           }
@@ -2768,7 +4422,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 149,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2787,7 +4441,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2826,7 +4480,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2835,7 +4489,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 31,
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2875,7 +4529,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 75,
+            "line" : 148,
             "column" : 31,
             "source_fragment" : "= true; ..."
           }
@@ -2894,7 +4548,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 149,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2913,7 +4567,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2952,7 +4606,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2961,7 +4615,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 32,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -2978,7 +4632,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -3007,8 +4661,47 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 138,
-            "column" : 35,
+            "line" : 211,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 212,
+            "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -3046,7 +4739,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 139,
+            "line" : 213,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -3055,7 +4748,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 33,
+      "id" : 41,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -3088,7 +4781,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -3117,8 +4810,47 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 148,
-            "column" : 35,
+            "line" : 222,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 223,
+            "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -3156,7 +4888,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 149,
+            "line" : 224,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -3185,7 +4917,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 226,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -3204,7 +4936,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 227,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -3223,7 +4955,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 228,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -3242,7 +4974,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 229,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -3261,7 +4993,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 230,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -3280,7 +5012,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 232,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -3299,7 +5031,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 158,
+            "line" : 233,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -3318,7 +5050,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 234,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -3337,7 +5069,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 235,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -3345,246 +5077,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
-      "id" : 34,
-      "runtime_data" : [],
-      "primitives" : [
+      "name" : "FabricIngress.spgw_ingress.load_dbuf_far_attributes",
+      "id" : 42,
+      "runtime_data" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
+          "name" : "drop",
+          "bitwidth" : 1
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
-          }
+          "name" : "notify_cp",
+          "bitwidth" : 1
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
+          "name" : "tunnel_src_port",
+          "bitwidth" : 16
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 199,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "tcp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 200,
-            "column" : 8,
-            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 201,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_tcp.setInvalid()"
-          }
+          "name" : "teid",
+          "bitwidth" : 32
         }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_udp",
-      "id" : 35,
-      "runtime_data" : [],
+      ],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 222,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -3592,18 +5150,182 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 223,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 224,
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 226,
+            "column" : 40,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 5
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 227,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 228,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 229,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 230,
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3614,15 +5336,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
+            "line" : 232,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -3633,15 +5355,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 233,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3652,15 +5374,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 234,
             "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -3671,143 +5393,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 205,
-            "column" : 8,
-            "source_fragment" : "hdr.udp = hdr.inner_udp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 206,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_udp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_icmp",
-      "id" : 36,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
               "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "value" : "0x0868"
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
+            "line" : 235,
             "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "source_fragment" : "= 2152; ..."
           }
         },
         {
@@ -3815,365 +5409,35 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr34"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 210,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "icmp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 211,
-            "column" : 8,
-            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 212,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_icmp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_unknown",
-      "id" : 37,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 216,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "line" : 246,
+            "column" : 43,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 38,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4253,7 +5517,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 39,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4261,7 +5525,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 45,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -4282,44 +5576,8 @@
       ]
     },
     {
-      "name" : "act_1",
-      "id" : 40,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_2",
-      "id" : 41,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4336,8 +5594,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
+            "line" : 282,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -4345,72 +5603,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 42,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 281,
-            "column" : 32,
-            "source_fragment" : "= true; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 43,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4427,16 +5620,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 299,
+            "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 44,
+      "name" : "act_4",
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4499,8 +5692,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 45,
+      "name" : "act_5",
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4525,8 +5718,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 46,
+      "name" : "act_6",
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4583,8 +5776,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 47,
+      "name" : "act_7",
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4592,7 +5785,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -4628,7 +5821,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
@@ -4642,37 +5835,37 @@
     },
     {
       "name" : "nop",
-      "id" : 48,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 49,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 50,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 51,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
       "id" : 52,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
+      "name" : "nop",
       "id" : 53,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 54,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 55,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 56,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
+      "id" : 57,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -4740,7 +5933,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 166,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -5158,7 +6351,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 161,
+            "line" : 162,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -5167,7 +6360,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 54,
+      "id" : 58,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -5180,7 +6373,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit36"]
             },
             {
               "type" : "expression",
@@ -5209,7 +6402,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
             },
             {
               "type" : "runtime_data",
@@ -5227,655 +6420,12 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 55,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 56,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 57,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 58,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 59,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
       "id" : 60,
       "runtime_data" : [],
       "primitives" : [
@@ -5946,90 +6496,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -6043,11 +6514,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -6061,9 +6532,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6071,7 +6542,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -6085,11 +6556,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -6103,15 +6574,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
       "id" : 61,
       "runtime_data" : [],
       "primitives" : [
@@ -6150,90 +6621,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -6247,11 +6639,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -6265,9 +6657,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6275,7 +6667,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -6289,11 +6681,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -6307,15 +6699,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
       "id" : 62,
       "runtime_data" : [],
       "primitives" : [
@@ -6420,6 +6812,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
+      "id" : 63,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -6503,7 +6986,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -6517,132 +7000,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6670,7 +7028,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -6684,7 +7042,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6710,7 +7068,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
       "id" : 64,
       "runtime_data" : [],
       "primitives" : [
@@ -6785,14 +7143,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
+              "value" : "int_port_ids"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 47,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
+            "source_fragment" : "hdr.int_port_ids.setValid()"
           }
         },
         {
@@ -6800,18 +7158,31 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
+              "value" : ["int_port_ids", "ingress_port_id"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 42,
+            "line" : 48,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
         },
         {
@@ -6819,7 +7190,39 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -6833,7 +7236,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6861,7 +7264,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -6875,7 +7278,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6901,7 +7304,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
       "id" : 65,
       "runtime_data" : [],
       "primitives" : [
@@ -6944,14 +7347,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
+              "value" : "int_port_ids"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 47,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
+            "source_fragment" : "hdr.int_port_ids.setValid()"
           }
         },
         {
@@ -6959,18 +7362,31 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
+              "value" : ["int_port_ids", "ingress_port_id"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 42,
+            "line" : 48,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
         },
         {
@@ -6978,7 +7394,39 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -6992,7 +7440,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7020,7 +7468,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -7034,7 +7482,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7060,7 +7508,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
       "id" : 66,
       "runtime_data" : [],
       "primitives" : [
@@ -7169,131 +7617,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 67,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_port_ids"
             }
           ],
@@ -7369,6 +7692,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
+      "id" : 67,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -7392,7 +7806,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
             }
           ],
           "source_info" : {
@@ -7407,7 +7821,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -7421,11 +7835,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -7439,9 +7853,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -7449,7 +7863,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -7463,11 +7877,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -7481,15 +7895,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
       "id" : 68,
       "runtime_data" : [],
       "primitives" : [
@@ -7564,85 +7978,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_switch_id"
             }
           ],
@@ -7662,7 +7997,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
             }
           ],
           "source_info" : {
@@ -7677,7 +8012,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -7691,11 +8026,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -7709,9 +8044,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7719,7 +8054,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -7733,11 +8068,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -7751,15 +8086,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
       "id" : 69,
       "runtime_data" : [],
       "primitives" : [
@@ -7802,85 +8137,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_switch_id"
             }
           ],
@@ -7900,7 +8156,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
             }
           ],
           "source_info" : {
@@ -7915,7 +8171,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -7929,11 +8185,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -7947,9 +8203,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7957,7 +8213,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -7971,11 +8227,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -7989,15 +8245,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
       "id" : 70,
       "runtime_data" : [],
       "primitives" : [
@@ -8106,6 +8362,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
+      "id" : 71,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_port_ids"
             }
           ],
@@ -8204,7 +8585,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
             }
           ],
           "source_info" : {
@@ -8219,7 +8600,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -8233,460 +8614,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x04"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 115,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0010"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 116,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 71,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 72,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 73,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 74,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8714,7 +8642,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -8728,7 +8656,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8754,8 +8682,8 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 75,
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8763,14 +8691,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
+              "value" : "int_q_occupancy"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 74,
+            "line" : 60,
             "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
         },
         {
@@ -8778,7 +8706,26 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
             },
             {
               "type" : "expression",
@@ -8787,22 +8734,12 @@
                 "value" : {
                   "op" : "&",
                   "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
                   },
                   "right" : {
                     "type" : "hexstr",
-                    "value" : "0xffffffff"
+                    "value" : "0xffffff"
                   }
                 }
               }
@@ -8810,9 +8747,24 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 63,
             "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
           }
         },
         {
@@ -8820,7 +8772,105 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -8834,11 +8884,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x01"
+                        "value" : "0x03"
                       }
                     }
                   },
@@ -8852,9 +8902,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 97,
+            "line" : 109,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8862,7 +8912,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -8876,11 +8926,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0004"
+                        "value" : "0x000c"
                       }
                     }
                   },
@@ -8894,15 +8944,563 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 110,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "id" : 73,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
+      "id" : 74,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id38"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x04"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 115,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0010"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 116,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
+      "id" : 75,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
       "id" : 76,
       "runtime_data" : [],
       "primitives" : [
@@ -8941,26 +9539,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -8974,53 +9557,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -9034,9 +9575,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -9044,7 +9585,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -9058,11 +9599,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -9076,15 +9617,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
       "id" : 77,
       "runtime_data" : [],
       "primitives" : [
@@ -9142,26 +9683,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -9175,53 +9701,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -9235,9 +9719,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -9245,7 +9729,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -9259,11 +9743,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -9277,15 +9761,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
       "id" : 78,
       "runtime_data" : [],
       "primitives" : [
@@ -9377,6 +9861,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
+      "id" : 79,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -9438,7 +10013,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -9452,132 +10027,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 79,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9605,7 +10055,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -9619,7 +10069,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9645,7 +10095,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
       "id" : 80,
       "runtime_data" : [],
       "primitives" : [
@@ -9688,14 +10138,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
+              "value" : "int_egress_tstamp"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
         },
         {
@@ -9703,26 +10153,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
             },
             {
               "type" : "expression",
@@ -9736,7 +10167,49 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9764,7 +10237,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -9778,7 +10251,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9804,7 +10277,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
       "id" : 81,
       "runtime_data" : [],
       "primitives" : [
@@ -9866,14 +10339,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
+              "value" : "int_egress_tstamp"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
         },
         {
@@ -9881,26 +10354,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
             },
             {
               "type" : "expression",
@@ -9914,7 +10368,49 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9942,7 +10438,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -9956,7 +10452,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9982,7 +10478,7 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
       "id" : 82,
       "runtime_data" : [],
       "primitives" : [
@@ -10078,131 +10574,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 83,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_egress_tstamp"
             }
           ],
@@ -10256,6 +10627,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
+      "id" : 83,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -10294,7 +10756,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -10308,11 +10770,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -10326,9 +10788,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -10336,7 +10798,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -10350,11 +10812,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -10368,15 +10830,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
       "id" : 84,
       "runtime_data" : [],
       "primitives" : [
@@ -10419,63 +10881,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_ingress_tstamp"
             }
           ],
@@ -10510,7 +10915,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -10524,11 +10929,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -10542,9 +10947,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10552,7 +10957,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -10566,11 +10971,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -10584,15 +10989,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
       "id" : 85,
       "runtime_data" : [],
       "primitives" : [
@@ -10654,63 +11059,6 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
               "value" : "int_ingress_tstamp"
             }
           ],
@@ -10745,7 +11093,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -10759,11 +11107,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -10777,9 +11125,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10787,7 +11135,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -10801,11 +11149,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -10819,15 +11167,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
       "id" : 86,
       "runtime_data" : [],
       "primitives" : [
@@ -10923,6 +11271,131 @@
           "parameters" : [
             {
               "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
+      "id" : 87,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "int_egress_tstamp"
             }
           ],
@@ -11014,7 +11487,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
             },
             {
               "type" : "expression",
@@ -11028,7 +11501,727 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
+      "id" : 88,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "id" : 89,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
+      "id" : 90,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11056,7 +12249,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
             },
             {
               "type" : "expression",
@@ -11070,7 +12263,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11097,7 +12290,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 87,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11138,7 +12331,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 88,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11246,7 +12439,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 127,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -11255,7 +12448,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 89,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11325,7 +12518,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -11353,7 +12546,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 90,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11375,7 +12568,7 @@
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 91,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11388,7 +12581,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -11407,7 +12600,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -11426,7 +12619,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 144,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -11445,7 +12638,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -11464,7 +12657,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -11506,7 +12699,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -11525,7 +12718,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -11544,7 +12737,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -11563,7 +12756,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 326,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -11582,7 +12775,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 157,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -11601,7 +12794,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 141,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -11620,7 +12813,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 329,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -11639,7 +12832,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -11658,7 +12851,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -11673,7 +12866,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -11692,7 +12885,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 323,
+            "line" : 334,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -11711,7 +12904,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 335,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -11753,7 +12946,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 336,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -11772,7 +12965,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 338,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -11787,7 +12980,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 341,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -11806,7 +12999,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 342,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -11825,7 +13018,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 343,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -11844,7 +13037,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -11863,7 +13056,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 345,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -11882,7 +13075,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 346,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -11901,7 +13094,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 347,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -11920,7 +13113,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 348,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -11939,7 +13132,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 349,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -11958,7 +13151,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 350,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -11966,8 +13159,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 92,
+      "name" : "act_8",
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11983,8 +13176,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 93,
+      "name" : "act_9",
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12034,8 +13227,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 94,
+      "name" : "act_10",
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12056,8 +13249,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 95,
+      "name" : "act_11",
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12086,8 +13279,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 96,
+      "name" : "act_12",
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12116,8 +13309,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 97,
+      "name" : "act_13",
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12138,8 +13331,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 98,
+      "name" : "act_14",
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12187,8 +13380,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 99,
+      "name" : "act_15",
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12209,8 +13402,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 100,
+      "name" : "act_16",
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12258,74 +13451,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 101,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 102,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 103,
+      "name" : "act_17",
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12342,16 +13469,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
+            "line" : 359,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 104,
+      "name" : "act_18",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12380,8 +13507,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 105,
+      "name" : "act_19",
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12416,8 +13543,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 106,
+      "name" : "act_20",
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12443,7 +13570,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       }
                     }
                   },
@@ -12465,8 +13592,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 107,
+      "name" : "act_21",
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12514,8 +13641,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 108,
+      "name" : "act_22",
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12541,7 +13668,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes40"]
                       }
                     }
                   },
@@ -12563,8 +13690,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 109,
+      "name" : "act_23",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12590,7 +13717,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words39"]
                       }
                     }
                   },
@@ -12640,37 +13767,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
+          "action_ids" : [43],
           "actions" : ["act"],
-          "base_default_next" : "tbl_act_0",
-          "next_tables" : {
-            "act" : "tbl_act_0"
-          },
-          "default_entry" : {
-            "action_id" : 38,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_0",
-          "id" : 1,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_0"],
           "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
           "next_tables" : {
-            "act_0" : "FabricIngress.spgw_ingress.interface_lookup"
+            "act" : "FabricIngress.spgw_ingress.interface_lookup"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12678,10 +13782,10 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.interface_lookup",
-          "id" : 2,
+          "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 55,
+            "line" : 128,
             "column" : 10,
             "source_fragment" : "interface_lookup"
           },
@@ -12705,28 +13809,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [29],
+          "action_ids" : [37],
           "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
-          "base_default_next" : "node_6",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.spgw_ingress.set_source_iface" : "node_6"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
-            "action_id" : 29,
+            "action_id" : 37,
             "action_const" : true,
             "action_data" : ["0x0", "0x0", "0x1"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
+          "name" : "tbl_act_0",
+          "id" : 2,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12734,132 +13833,48 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_8",
+          "action_ids" : [44],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "act_1" : "node_8"
+            "act_0" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "name" : "tbl_act_1",
+          "id" : 3,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [45],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 45,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 93,
-            "column" : 10,
-            "source_fragment" : "uplink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "teid",
-              "target" : ["gtpu", "teid"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [31],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 31,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 82,
-            "column" : 10,
-            "source_fragment" : "downlink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [30],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 30,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_2",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_13",
-          "next_tables" : {
-            "act_2" : "node_13"
-          },
-          "default_entry" : {
-            "action_id" : 41,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 75,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -12889,17 +13904,17 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34, 35, 36, 37],
-          "actions" : ["FabricIngress.spgw_ingress.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_inner_udp", "FabricIngress.spgw_ingress.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_inner_unknown"],
-          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "action_ids" : [29, 30, 31, 32],
+          "actions" : ["FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown"],
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12908,7 +13923,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 233,
+                "line" : 89,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -12927,7 +13942,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 34,
+                "action_id" : 29,
                 "action_data" : []
               },
               "priority" : 1
@@ -12935,7 +13950,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 234,
+                "line" : 90,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -12954,7 +13969,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 35,
+                "action_id" : 30,
                 "action_data" : []
               },
               "priority" : 2
@@ -12962,7 +13977,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 91,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -12981,7 +13996,248 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 36,
+                "action_id" : 31,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 166,
+            "column" : 10,
+            "source_fragment" : "uplink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "teid",
+              "target" : ["gtpu", "teid"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [39],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 39,
+            "action_const" : true,
+            "action_data" : ["0x0", "0x0", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 155,
+            "column" : 10,
+            "source_fragment" : "downlink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [38],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 38,
+            "action_const" : true,
+            "action_data" : ["0x0", "0x0", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 282,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [46],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_15",
+          "next_tables" : {
+            "act_2" : "node_15"
+          },
+          "default_entry" : {
+            "action_id" : 46,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 75,
+            "column" : 10,
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [33, 34, 35, 36],
+          "actions" : ["FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown"],
+          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+          },
+          "default_entry" : {
+            "action_id" : 36,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 89,
+                "column" : 12,
+                "source_fragment" : "(true, false, false) : decap_inner_tcp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 33,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 90,
+                "column" : 12,
+                "source_fragment" : "(false, true, false) : decap_inner_udp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 34,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "column" : 12,
+                "source_fragment" : "(false, false, true) : decap_inner_icmp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 35,
                 "action_data" : []
               },
               "priority" : 3
@@ -12990,10 +14246,10 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.far_lookup",
-          "id" : 8,
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 163,
+            "line" : 249,
             "column" : 10,
             "source_fragment" : "far_lookup"
           },
@@ -13011,56 +14267,28 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 33],
-          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
-          "base_default_next" : "node_16",
+          "action_ids" : [40, 41, 42],
+          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes", "FabricIngress.spgw_ingress.load_dbuf_far_attributes"],
+          "base_default_next" : "tbl_act_3",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_16",
-            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_16"
+            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "tbl_act_3",
+            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "tbl_act_3",
+            "FabricIngress.spgw_ingress.load_dbuf_far_attributes" : "tbl_act_3"
           },
           "default_entry" : {
-            "action_id" : 32,
+            "action_id" : 40,
             "action_const" : true,
-            "action_data" : ["0x1", "0x1"],
+            "action_data" : ["0x1", "0x0"],
             "action_entry_const" : true
           }
         },
         {
           "name" : "tbl_act_3",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_3"],
-          "base_default_next" : "tbl_act_4",
-          "next_tables" : {
-            "act_3" : "tbl_act_4"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_4",
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 299,
+            "column" : 36,
             "source_fragment" : "="
           },
           "key" : [],
@@ -13070,21 +14298,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_4"],
+          "action_ids" : [47],
+          "actions" : ["act_3"],
           "base_default_next" : "node_19",
           "next_tables" : {
-            "act_4" : "node_19"
+            "act_3" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_4",
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -13099,21 +14327,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_5"],
+          "action_ids" : [48],
+          "actions" : ["act_4"],
           "base_default_next" : "node_21",
           "next_tables" : {
-            "act_5" : "node_21"
+            "act_4" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_act_5",
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -13128,14 +14356,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_6"],
+          "action_ids" : [49],
+          "actions" : ["act_5"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_5" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13622,7 +14850,7 @@
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_act_6",
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -13637,21 +14865,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_7"],
+          "action_ids" : [50],
+          "actions" : ["act_6"],
           "base_default_next" : "node_40",
           "next_tables" : {
-            "act_7" : "node_40"
+            "act_6" : "node_40"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_act_7",
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -13666,14 +14894,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_8"],
+          "action_ids" : [51],
+          "actions" : ["act_7"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_8" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_7" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13777,72 +15005,58 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "tbl_act_0"
+          "false_next" : "FabricIngress.spgw_ingress.interface_lookup"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "spgw_ingress_tmp"]
+              }
+            }
+          },
+          "true_next" : "node_8",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_8",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "line" : 272,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
               "op" : "==",
               "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
-                  }
-                }
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
               },
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "hexstr",
+                "value" : "0x03"
               }
             }
           },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_8"
+          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
+          "false_next" : "node_10"
         },
         {
-          "name" : "node_8",
-          "id" : 2,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_9",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_9",
+          "name" : "node_10",
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 253,
-            "column" : 12,
+            "line" : 276,
+            "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
           "expression" : {
@@ -13864,8 +15078,34 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
-            "column" : 12,
+            "line" : 281,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_15"
+        },
+        {
+          "name" : "node_15",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 286,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
           "expression" : {
@@ -13889,43 +15129,10 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu",
+          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
           "false_next" : "FabricIngress.spgw_ingress.far_lookup"
         },
         {
-          "name" : "node_16",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 277,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.far_dropped == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_3",
-          "false_next" : "tbl_act_4"
-        },
-        {
           "name" : "node_19",
           "id" : 6,
           "source_info" : {
@@ -13945,7 +15152,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_act_4",
           "false_next" : "node_21"
         },
         {
@@ -13975,7 +15182,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_act_5",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -14145,7 +15352,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_act_6",
           "false_next" : "node_40"
         },
         {
@@ -14171,7 +15378,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
+          "true_next" : "tbl_act_7",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -14188,7 +15395,7 @@
       "init_table" : "node_45",
       "tables" : [
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_act_8",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -14203,21 +15410,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
-          "actions" : ["act_9"],
+          "action_ids" : [96],
+          "actions" : ["act_8"],
           "base_default_next" : "node_47",
           "next_tables" : {
-            "act_9" : "node_47"
+            "act_8" : "node_47"
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 96,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_act_9",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -14232,21 +15439,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["act_10"],
+          "action_ids" : [97],
+          "actions" : ["act_9"],
           "base_default_next" : "node_49",
           "next_tables" : {
-            "act_10" : "node_49"
+            "act_9" : "node_49"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act_10",
           "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14261,14 +15468,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["act_11"],
+          "action_ids" : [98],
+          "actions" : ["act_10"],
           "base_default_next" : "node_51",
           "next_tables" : {
-            "act_11" : "node_51"
+            "act_10" : "node_51"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 98,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14290,14 +15497,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
+          "action_ids" : [91],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14319,14 +15526,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
+          "action_ids" : [92],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14361,22 +15568,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90, 50],
+          "action_ids" : [94, 54],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_12",
-            "__MISS__" : "tbl_act_13"
+            "__HIT__" : "tbl_act_11",
+            "__MISS__" : "tbl_act_12"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_act_11",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -14385,21 +15592,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
-          "actions" : ["act_12"],
+          "action_ids" : [99],
+          "actions" : ["act_11"],
           "base_default_next" : "node_58",
           "next_tables" : {
-            "act_12" : "node_58"
+            "act_11" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
+          "name" : "tbl_act_12",
           "id" : 33,
           "key" : [],
           "match_type" : "exact",
@@ -14408,14 +15615,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96],
-          "actions" : ["act_13"],
+          "action_ids" : [100],
+          "actions" : ["act_12"],
           "base_default_next" : "node_58",
           "next_tables" : {
-            "act_13" : "node_58"
+            "act_12" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14437,21 +15644,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89],
+          "action_ids" : [93],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "node_61",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
+          "name" : "tbl_act_13",
           "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14466,21 +15673,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [98],
-          "actions" : ["act_15"],
+          "action_ids" : [102],
+          "actions" : ["act_14"],
           "base_default_next" : "node_63",
           "next_tables" : {
-            "act_15" : "node_63"
+            "act_14" : "node_63"
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 102,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_act_14",
           "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14495,21 +15702,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
-          "actions" : ["act_14"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [101],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "act_14" : "tbl_act_18"
+            "act_13" : "node_69"
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 101,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_act_15",
           "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14524,21 +15731,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [100],
-          "actions" : ["act_17"],
+          "action_ids" : [104],
+          "actions" : ["act_16"],
           "base_default_next" : "node_67",
           "next_tables" : {
-            "act_17" : "node_67"
+            "act_16" : "node_67"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 104,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_16",
           "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14553,92 +15760,11 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [99],
-          "actions" : ["act_16"],
-          "base_default_next" : "tbl_act_18",
-          "next_tables" : {
-            "act_16" : "tbl_act_18"
-          },
-          "default_entry" : {
-            "action_id" : 99,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_18",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [102],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_19" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 102,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_19",
-          "id" : 40,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [101],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_72",
-          "next_tables" : {
-            "act_18" : "node_72"
-          },
-          "default_entry" : {
-            "action_id" : 101,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 41,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
           "action_ids" : [103],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_74",
+          "actions" : ["act_15"],
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "act_20" : "node_74"
+            "act_15" : "node_69"
           },
           "default_entry" : {
             "action_id" : 103,
@@ -14649,11 +15775,11 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 42,
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 347,
-            "column" : 12,
+            "line" : 356,
+            "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -14663,14 +15789,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
+          "action_ids" : [95],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_76",
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_76"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 95,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 40,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 359,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [105],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_74",
+          "next_tables" : {
+            "act_17" : "node_74"
+          },
+          "default_entry" : {
+            "action_id" : 105,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14678,7 +15833,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 43,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -14717,23 +15872,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53, 48],
+          "action_ids" : [57, 52],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_79",
+          "base_default_next" : "node_77",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_79",
-            "nop" : "node_79"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_77",
+            "nop" : "node_77"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 44,
+          "name" : "tbl_act_18",
+          "id" : 42,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14741,14 +15896,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104],
-          "actions" : ["act_21"],
+          "action_ids" : [106],
+          "actions" : ["act_18"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_21" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_18" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14756,7 +15911,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 45,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -14777,23 +15932,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54, 49],
+          "action_ids" : [58, 53],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_82",
+          "base_default_next" : "node_80",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_82",
-            "nop" : "node_82"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_80",
+            "nop" : "node_80"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 46,
+          "name" : "tbl_act_19",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -14807,14 +15962,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_84",
+          "action_ids" : [107],
+          "actions" : ["act_19"],
+          "base_default_next" : "node_82",
           "next_tables" : {
-            "act_22" : "node_84"
+            "act_19" : "node_82"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14822,7 +15977,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 47,
+          "id" : 45,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -14843,7 +15998,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 51],
+          "action_ids" : [59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 55],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -14866,7 +16021,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 55,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -14886,7 +16041,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 55,
+                "action_id" : 59,
                 "action_data" : []
               },
               "priority" : 1
@@ -14905,7 +16060,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 56,
+                "action_id" : 60,
                 "action_data" : []
               },
               "priority" : 2
@@ -14924,7 +16079,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 57,
+                "action_id" : 61,
                 "action_data" : []
               },
               "priority" : 3
@@ -14943,7 +16098,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 58,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 4
@@ -14962,7 +16117,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 5
@@ -14981,7 +16136,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 60,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 6
@@ -15000,7 +16155,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 61,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 7
@@ -15019,7 +16174,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 62,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 8
@@ -15038,7 +16193,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 63,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 9
@@ -15057,7 +16212,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 64,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 10
@@ -15076,7 +16231,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 65,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 11
@@ -15095,7 +16250,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 66,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 12
@@ -15114,7 +16269,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 67,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 13
@@ -15133,7 +16288,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 14
@@ -15152,7 +16307,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 15
@@ -15171,7 +16326,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 16
@@ -15180,7 +16335,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 48,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -15201,30 +16356,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 52],
+          "action_ids" : [75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 56],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_23",
+          "base_default_next" : "tbl_act_20",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_23",
-            "NoAction" : "tbl_act_23"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_20",
+            "NoAction" : "tbl_act_20"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 56,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -15244,7 +16399,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 1
@@ -15263,7 +16418,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 2
@@ -15282,7 +16437,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 3
@@ -15301,7 +16456,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 4
@@ -15320,7 +16475,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 5
@@ -15339,7 +16494,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 6
@@ -15358,7 +16513,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 7
@@ -15377,7 +16532,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 8
@@ -15396,7 +16551,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 9
@@ -15415,7 +16570,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 10
@@ -15434,7 +16589,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 11
@@ -15453,7 +16608,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 12
@@ -15472,7 +16627,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 13
@@ -15491,7 +16646,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 14
@@ -15510,7 +16665,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 15
@@ -15529,7 +16684,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 16
@@ -15537,8 +16692,8 @@
           ]
         },
         {
-          "name" : "tbl_act_23",
-          "id" : 49,
+          "name" : "tbl_act_20",
+          "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -15552,22 +16707,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_88",
+          "action_ids" : [109],
+          "actions" : ["act_21"],
+          "base_default_next" : "node_86",
           "next_tables" : {
-            "act_24" : "node_88"
+            "act_21" : "node_86"
           },
           "default_entry" : {
-            "action_id" : 107,
+            "action_id" : 109,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 50,
+          "name" : "tbl_act_21",
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -15581,22 +16736,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_90",
+          "action_ids" : [108],
+          "actions" : ["act_20"],
+          "base_default_next" : "node_88",
           "next_tables" : {
-            "act_23" : "node_90"
+            "act_20" : "node_88"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 108,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 51,
+          "name" : "tbl_act_22",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -15610,22 +16765,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_92",
+          "action_ids" : [110],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_90",
           "next_tables" : {
-            "act_25" : "node_92"
+            "act_22" : "node_90"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 52,
+          "name" : "tbl_act_23",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -15639,14 +16794,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109],
-          "actions" : ["act_26"],
+          "action_ids" : [111],
+          "actions" : ["act_23"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_26" : null
+            "act_23" : null
           },
           "default_entry" : {
-            "action_id" : 109,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15685,7 +16840,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_act_8",
           "false_next" : "node_47"
         },
         {
@@ -15711,7 +16866,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_act_9",
           "false_next" : "node_49"
         },
         {
@@ -15764,7 +16919,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_10",
           "false_next" : "node_51"
         },
         {
@@ -15892,7 +17047,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_13",
           "false_next" : "node_65"
         },
         {
@@ -15918,8 +17073,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_69"
         },
         {
           "name" : "node_65",
@@ -15961,8 +17116,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_15",
+          "false_next" : "node_69"
         },
         {
           "name" : "node_67",
@@ -15987,17 +17142,17 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_69"
         },
         {
-          "name" : "node_70",
+          "name" : "node_69",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 354,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
           },
           "expression" : {
             "type" : "expression",
@@ -16016,44 +17171,20 @@
               },
               "right" : {
                 "type" : "bool",
-                "value" : true
+                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_72"
+          "true_next" : "node_70",
+          "false_next" : "node_74"
         },
         {
-          "name" : "node_72",
+          "name" : "node_70",
           "id" : 27,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_egress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_76"
-        },
-        {
-          "name" : "node_74",
-          "id" : 28,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
-            "column" : 12,
+            "line" : 355,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
           "expression" : {
@@ -16078,10 +17209,43 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_76"
+          "false_next" : "node_72"
         },
         {
-          "name" : "node_76",
+          "name" : "node_72",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 358,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr34"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_74"
+        },
+        {
+          "name" : "node_74",
           "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -16158,10 +17322,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_77"
+          "true_next" : "node_75"
         },
         {
-          "name" : "node_77",
+          "name" : "node_75",
           "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -16180,7 +17344,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source34"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source35"]
                   }
                 }
               },
@@ -16191,10 +17355,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_79"
+          "false_next" : "node_77"
         },
         {
-          "name" : "node_79",
+          "name" : "node_77",
           "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -16214,10 +17378,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_21"
+          "true_next" : "tbl_act_18"
         },
         {
-          "name" : "node_82",
+          "name" : "node_80",
           "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16236,7 +17400,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit35"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit36"]
                   }
                 }
               },
@@ -16246,11 +17410,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_22",
-          "false_next" : "node_84"
+          "true_next" : "tbl_act_19",
+          "false_next" : "node_82"
         },
         {
-          "name" : "node_84",
+          "name" : "node_82",
           "id" : 33,
           "expression" : {
             "type" : "expression",
@@ -16274,7 +17438,7 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_88",
+          "name" : "node_86",
           "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16293,11 +17457,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
-          "false_next" : "node_90"
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_88"
         },
         {
-          "name" : "node_90",
+          "name" : "node_88",
           "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16316,11 +17480,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_92"
+          "true_next" : "tbl_act_22",
+          "false_next" : "node_90"
         },
         {
-          "name" : "node_92",
+          "name" : "node_90",
           "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16340,7 +17504,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_26"
+          "true_next" : "tbl_act_23"
         }
       ]
     }
@@ -16377,7 +17541,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 375,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index bb77114..d7b172f 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -471,6 +471,9 @@
   action_refs {
     id: 16787606
   }
+  action_refs {
+    id: 16801146
+  }
   const_default_action_id: 16834935
   size: 2048
 }
@@ -918,30 +921,39 @@
 }
 actions {
   preamble {
-    id: 16829280
-    name: "FabricIngress.spgw_ingress.decap_inner_tcp"
-    alias: "decap_inner_tcp"
+    id: 16801146
+    name: "FabricIngress.spgw_ingress.load_dbuf_far_attributes"
+    alias: "load_dbuf_far_attributes"
   }
-}
-actions {
-  preamble {
-    id: 16815878
-    name: "FabricIngress.spgw_ingress.decap_inner_udp"
-    alias: "decap_inner_udp"
+  params {
+    id: 1
+    name: "drop"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16801274
-    name: "FabricIngress.spgw_ingress.decap_inner_icmp"
-    alias: "decap_inner_icmp"
+  params {
+    id: 2
+    name: "notify_cp"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16830582
-    name: "FabricIngress.spgw_ingress.decap_inner_unknown"
-    alias: "decap_inner_unknown"
+  params {
+    id: 3
+    name: "tunnel_src_port"
+    bitwidth: 16
+  }
+  params {
+    id: 4
+    name: "tunnel_src_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 5
+    name: "tunnel_dst_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 6
+    name: "teid"
+    bitwidth: 32
   }
 }
 actions {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 18163de..c28ef4e 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -4,14 +4,13 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
+        ["tmp_2", 16, false],
+        ["tmp_3", 4, false],
         ["tmp", 32, false],
-        ["tmp_3", 32, false],
-        ["spgw_ingress_hasReturned", 1, false],
+        ["tmp_0", 32, false],
+        ["spgw_ingress_tmp", 1, false],
         ["egress_next_tmp", 1, false],
-        ["spgw_egress_hasReturned", 1, false],
         ["fabric_metadata_t._ip_eth_type0", 16, false],
         ["fabric_metadata_t._vlan_id1", 12, false],
         ["fabric_metadata_t._vlan_pri2", 3, false],
@@ -46,6 +45,7 @@
         ["fabric_metadata_t._spgw_notify_spgwc31", 1, false],
         ["fabric_metadata_t._spgw_needs_gtpu_encap32", 1, false],
         ["fabric_metadata_t._spgw_needs_gtpu_decap33", 1, false],
+        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr34", 1, false],
         ["_padding_0", 6, false]
       ]
     },
@@ -467,7 +467,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -505,7 +505,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -526,7 +526,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -552,7 +552,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -662,7 +662,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -688,7 +688,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -1182,7 +1182,7 @@
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 180,
+        "line" : 109,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1206,7 +1206,7 @@
       "id" : 13,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 301,
+        "line" : 312,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1282,7 +1282,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 375,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -2231,8 +2231,1662 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_source_iface",
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp",
       "id" : 27,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp",
+      "id" : 28,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "id" : 29,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "id" : 30,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp",
+      "id" : 31,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp",
+      "id" : 32,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp",
+      "id" : 33,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown",
+      "id" : 34,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 129,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.set_source_iface",
+      "id" : 35,
       "runtime_data" : [
         {
           "name" : "src_iface",
@@ -2262,7 +3916,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 50,
+            "line" : 123,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -2281,7 +3935,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 51,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "= direction; ..."
           }
@@ -2320,7 +3974,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 52,
+            "line" : 125,
             "column" : 33,
             "source_fragment" : "= (bool)skip_spgw; ..."
           }
@@ -2329,7 +3983,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 28,
+      "id" : 36,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2369,7 +4023,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 75,
+            "line" : 148,
             "column" : 31,
             "source_fragment" : "= true; ..."
           }
@@ -2388,7 +4042,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 149,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2407,7 +4061,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2446,7 +4100,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2455,7 +4109,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 29,
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2495,7 +4149,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 75,
+            "line" : 148,
             "column" : 31,
             "source_fragment" : "= true; ..."
           }
@@ -2514,7 +4168,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 149,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2533,7 +4187,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 150,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2572,7 +4226,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 151,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2581,7 +4235,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 30,
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -2598,7 +4252,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -2627,8 +4281,47 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 138,
-            "column" : 35,
+            "line" : 211,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 212,
+            "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -2666,7 +4359,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 139,
+            "line" : 213,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -2675,7 +4368,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 31,
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -2708,7 +4401,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -2737,8 +4430,47 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 148,
-            "column" : 35,
+            "line" : 222,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 223,
+            "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -2776,7 +4508,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 149,
+            "line" : 224,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -2805,7 +4537,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 226,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -2824,7 +4556,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 227,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -2843,7 +4575,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 228,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -2862,7 +4594,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 229,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -2881,7 +4613,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 230,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -2900,7 +4632,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 232,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -2919,7 +4651,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 158,
+            "line" : 233,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -2938,7 +4670,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 234,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -2957,7 +4689,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 235,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -2965,246 +4697,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
-      "id" : 32,
-      "runtime_data" : [],
-      "primitives" : [
+      "name" : "FabricIngress.spgw_ingress.load_dbuf_far_attributes",
+      "id" : 40,
+      "runtime_data" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
+          "name" : "drop",
+          "bitwidth" : 1
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
-          }
+          "name" : "notify_cp",
+          "bitwidth" : 1
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
+          "name" : "tunnel_src_port",
+          "bitwidth" : 16
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
         },
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 199,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "tcp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 200,
-            "column" : 8,
-            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 201,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_tcp.setInvalid()"
-          }
+          "name" : "teid",
+          "bitwidth" : 32
         }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_udp",
-      "id" : 33,
-      "runtime_data" : [],
+      ],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 222,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -3212,18 +4770,182 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 223,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 224,
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 226,
+            "column" : 40,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 5
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 227,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 228,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 229,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 230,
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3234,15 +4956,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
+            "line" : 232,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -3253,15 +4975,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 233,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3272,15 +4994,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 234,
             "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -3291,143 +5013,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 205,
-            "column" : 8,
-            "source_fragment" : "hdr.udp = hdr.inner_udp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 206,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_udp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_icmp",
-      "id" : 34,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
               "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "value" : "0x0868"
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
+            "line" : 235,
             "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "source_fragment" : "= 2152; ..."
           }
         },
         {
@@ -3435,365 +5029,35 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr34"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 210,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "icmp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 211,
-            "column" : 8,
-            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 212,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_icmp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_unknown",
-      "id" : 35,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 216,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "line" : 246,
+            "column" : 43,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 36,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3873,7 +5137,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 37,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3881,7 +5145,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 43,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -3902,44 +5196,8 @@
       ]
     },
     {
-      "name" : "act_1",
-      "id" : 38,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_2",
-      "id" : 39,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3956,8 +5214,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
+            "line" : 282,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -3965,72 +5223,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 40,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 281,
-            "column" : 32,
-            "source_fragment" : "= true; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 41,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4047,16 +5240,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 299,
+            "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 42,
+      "name" : "act_4",
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4119,8 +5312,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 43,
+      "name" : "act_5",
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4145,8 +5338,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 44,
+      "name" : "act_6",
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4203,8 +5396,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 45,
+      "name" : "act_7",
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4212,7 +5405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -4248,7 +5441,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
@@ -4262,13 +5455,13 @@
     },
     {
       "name" : "nop",
-      "id" : 46,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 47,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4309,7 +5502,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 48,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4417,7 +5610,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 127,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -4426,7 +5619,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 49,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4496,7 +5689,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -4524,7 +5717,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 50,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4546,7 +5739,7 @@
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 51,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4559,7 +5752,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -4578,7 +5771,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -4597,7 +5790,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 144,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -4616,7 +5809,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -4635,7 +5828,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -4677,7 +5870,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -4696,7 +5889,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -4715,7 +5908,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -4734,7 +5927,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 326,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -4753,7 +5946,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 157,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -4772,7 +5965,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 141,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4791,7 +5984,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 329,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -4810,7 +6003,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -4829,7 +6022,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 331,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -4844,7 +6037,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 333,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -4863,7 +6056,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 323,
+            "line" : 334,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -4882,7 +6075,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 335,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -4924,7 +6117,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 336,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -4943,7 +6136,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 338,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -4958,7 +6151,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 341,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -4977,7 +6170,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 342,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -4996,7 +6189,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 343,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -5015,7 +6208,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 344,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -5034,7 +6227,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 345,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -5053,7 +6246,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 346,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -5072,7 +6265,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 347,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -5091,7 +6284,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 348,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -5110,7 +6303,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 349,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -5129,7 +6322,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 350,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -5137,8 +6330,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 52,
+      "name" : "act_8",
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5154,8 +6347,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 53,
+      "name" : "act_9",
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5205,8 +6398,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 54,
+      "name" : "act_10",
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5227,8 +6420,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 55,
+      "name" : "act_11",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5257,8 +6450,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 56,
+      "name" : "act_12",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5287,8 +6480,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 57,
+      "name" : "act_13",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5309,8 +6502,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 58,
+      "name" : "act_14",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5358,8 +6551,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 59,
+      "name" : "act_15",
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5380,8 +6573,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 60,
+      "name" : "act_16",
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5429,74 +6622,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 61,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 62,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 63,
+      "name" : "act_17",
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5513,8 +6640,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
+            "line" : 359,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -5549,37 +6676,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36],
+          "action_ids" : [41],
           "actions" : ["act"],
-          "base_default_next" : "tbl_act_0",
-          "next_tables" : {
-            "act" : "tbl_act_0"
-          },
-          "default_entry" : {
-            "action_id" : 36,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_0",
-          "id" : 1,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [37],
-          "actions" : ["act_0"],
           "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
           "next_tables" : {
-            "act_0" : "FabricIngress.spgw_ingress.interface_lookup"
+            "act" : "FabricIngress.spgw_ingress.interface_lookup"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5587,10 +6691,10 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.interface_lookup",
-          "id" : 2,
+          "id" : 1,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 55,
+            "line" : 128,
             "column" : 10,
             "source_fragment" : "interface_lookup"
           },
@@ -5614,28 +6718,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27],
+          "action_ids" : [35],
           "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
-          "base_default_next" : "node_6",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.spgw_ingress.set_source_iface" : "node_6"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
-            "action_id" : 27,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : ["0x0", "0x0", "0x1"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
+          "name" : "tbl_act_0",
+          "id" : 2,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5643,132 +6742,48 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_8",
+          "action_ids" : [42],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "act_1" : "node_8"
+            "act_0" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "name" : "tbl_act_1",
+          "id" : 3,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [43],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 43,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 93,
-            "column" : 10,
-            "source_fragment" : "uplink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "teid",
-              "target" : ["gtpu", "teid"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [29],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 29,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 82,
-            "column" : 10,
-            "source_fragment" : "downlink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [28],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 28,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_2",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_13",
-          "next_tables" : {
-            "act_2" : "node_13"
-          },
-          "default_entry" : {
-            "action_id" : 39,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 75,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -5798,17 +6813,17 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 33, 34, 35],
-          "actions" : ["FabricIngress.spgw_ingress.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_inner_udp", "FabricIngress.spgw_ingress.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_inner_unknown"],
-          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "action_ids" : [27, 28, 29, 30],
+          "actions" : ["FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown"],
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+            "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 35,
+            "action_id" : 30,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5817,7 +6832,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 233,
+                "line" : 89,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -5836,7 +6851,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 32,
+                "action_id" : 27,
                 "action_data" : []
               },
               "priority" : 1
@@ -5844,7 +6859,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 234,
+                "line" : 90,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -5863,7 +6878,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 33,
+                "action_id" : 28,
                 "action_data" : []
               },
               "priority" : 2
@@ -5871,7 +6886,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 91,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -5890,7 +6905,248 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 34,
+                "action_id" : 29,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 166,
+            "column" : 10,
+            "source_fragment" : "uplink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "teid",
+              "target" : ["gtpu", "teid"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [37],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 37,
+            "action_const" : true,
+            "action_data" : ["0x0", "0x0", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 155,
+            "column" : 10,
+            "source_fragment" : "downlink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [36],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 36,
+            "action_const" : true,
+            "action_data" : ["0x0", "0x0", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 282,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [44],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_15",
+          "next_tables" : {
+            "act_2" : "node_15"
+          },
+          "default_entry" : {
+            "action_id" : 44,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 75,
+            "column" : 10,
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [31, 32, 33, 34],
+          "actions" : ["FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown"],
+          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
+            "FabricIngress.spgw_ingress.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+          },
+          "default_entry" : {
+            "action_id" : 34,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 89,
+                "column" : 12,
+                "source_fragment" : "(true, false, false) : decap_inner_tcp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 31,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 90,
+                "column" : 12,
+                "source_fragment" : "(false, true, false) : decap_inner_udp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 32,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "column" : 12,
+                "source_fragment" : "(false, false, true) : decap_inner_icmp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 33,
                 "action_data" : []
               },
               "priority" : 3
@@ -5899,10 +7155,10 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.far_lookup",
-          "id" : 8,
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 163,
+            "line" : 249,
             "column" : 10,
             "source_fragment" : "far_lookup"
           },
@@ -5920,56 +7176,28 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [30, 31],
-          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
-          "base_default_next" : "node_16",
+          "action_ids" : [38, 39, 40],
+          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes", "FabricIngress.spgw_ingress.load_dbuf_far_attributes"],
+          "base_default_next" : "tbl_act_3",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_16",
-            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_16"
+            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "tbl_act_3",
+            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "tbl_act_3",
+            "FabricIngress.spgw_ingress.load_dbuf_far_attributes" : "tbl_act_3"
           },
           "default_entry" : {
-            "action_id" : 30,
+            "action_id" : 38,
             "action_const" : true,
-            "action_data" : ["0x1", "0x1"],
+            "action_data" : ["0x1", "0x0"],
             "action_entry_const" : true
           }
         },
         {
           "name" : "tbl_act_3",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_3"],
-          "base_default_next" : "tbl_act_4",
-          "next_tables" : {
-            "act_3" : "tbl_act_4"
-          },
-          "default_entry" : {
-            "action_id" : 40,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_4",
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 299,
+            "column" : 36,
             "source_fragment" : "="
           },
           "key" : [],
@@ -5979,21 +7207,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_4"],
+          "action_ids" : [45],
+          "actions" : ["act_3"],
           "base_default_next" : "node_19",
           "next_tables" : {
-            "act_4" : "node_19"
+            "act_3" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_4",
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -6008,21 +7236,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_5"],
+          "action_ids" : [46],
+          "actions" : ["act_4"],
           "base_default_next" : "node_21",
           "next_tables" : {
-            "act_5" : "node_21"
+            "act_4" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_act_5",
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -6037,14 +7265,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_6"],
+          "action_ids" : [47],
+          "actions" : ["act_5"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_5" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6531,7 +7759,7 @@
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_act_6",
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -6546,21 +7774,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_7"],
+          "action_ids" : [48],
+          "actions" : ["act_6"],
           "base_default_next" : "node_40",
           "next_tables" : {
-            "act_7" : "node_40"
+            "act_6" : "node_40"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_act_7",
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -6575,14 +7803,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_8"],
+          "action_ids" : [49],
+          "actions" : ["act_7"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_8" : null
+            "act_7" : null
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6649,72 +7877,58 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "tbl_act_0"
+          "false_next" : "FabricIngress.spgw_ingress.interface_lookup"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "spgw_ingress_tmp"]
+              }
+            }
+          },
+          "true_next" : "node_8",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_8",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "line" : 272,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
               "op" : "==",
               "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
-                  }
-                }
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
               },
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "hexstr",
+                "value" : "0x03"
               }
             }
           },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_8"
+          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu_from_dbuf.decap_gtpu",
+          "false_next" : "node_10"
         },
         {
-          "name" : "node_8",
-          "id" : 2,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_9",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_9",
+          "name" : "node_10",
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 253,
-            "column" : 12,
+            "line" : 276,
+            "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
           "expression" : {
@@ -6736,8 +7950,34 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
-            "column" : 12,
+            "line" : 281,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_15"
+        },
+        {
+          "name" : "node_15",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 286,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
           "expression" : {
@@ -6761,43 +8001,10 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu",
+          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu.decap_gtpu",
           "false_next" : "FabricIngress.spgw_ingress.far_lookup"
         },
         {
-          "name" : "node_16",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 277,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.far_dropped == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_3",
-          "false_next" : "tbl_act_4"
-        },
-        {
           "name" : "node_19",
           "id" : 6,
           "source_info" : {
@@ -6817,7 +8024,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_act_4",
           "false_next" : "node_21"
         },
         {
@@ -6847,7 +8054,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_act_5",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -7017,7 +8224,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_act_6",
           "false_next" : "node_40"
         },
         {
@@ -7044,7 +8251,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_8"
+          "true_next" : "tbl_act_7"
         }
       ]
     },
@@ -7060,7 +8267,7 @@
       "init_table" : "node_44",
       "tables" : [
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_act_8",
           "id" : 25,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -7075,21 +8282,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_9"],
+          "action_ids" : [56],
+          "actions" : ["act_8"],
           "base_default_next" : "node_46",
           "next_tables" : {
-            "act_9" : "node_46"
+            "act_8" : "node_46"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_act_9",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -7104,21 +8311,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_10"],
+          "action_ids" : [57],
+          "actions" : ["act_9"],
           "base_default_next" : "node_48",
           "next_tables" : {
-            "act_10" : "node_48"
+            "act_9" : "node_48"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act_10",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7133,14 +8340,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["act_11"],
+          "action_ids" : [58],
+          "actions" : ["act_10"],
           "base_default_next" : "node_50",
           "next_tables" : {
-            "act_11" : "node_50"
+            "act_10" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7162,14 +8369,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [51],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7191,14 +8398,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [52],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7233,22 +8440,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50, 46],
+          "action_ids" : [54, 50],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_12",
-            "__MISS__" : "tbl_act_13"
+            "__HIT__" : "tbl_act_11",
+            "__MISS__" : "tbl_act_12"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_act_11",
           "id" : 31,
           "key" : [],
           "match_type" : "exact",
@@ -7257,21 +8464,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_12"],
+          "action_ids" : [59],
+          "actions" : ["act_11"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_12" : "node_57"
+            "act_11" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
+          "name" : "tbl_act_12",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -7280,14 +8487,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["act_13"],
+          "action_ids" : [60],
+          "actions" : ["act_12"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_13" : "node_57"
+            "act_12" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7309,21 +8516,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
+          "action_ids" : [53],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "node_60",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "node_60"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
+          "name" : "tbl_act_13",
           "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7338,21 +8545,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_15"],
+          "action_ids" : [62],
+          "actions" : ["act_14"],
           "base_default_next" : "node_62",
           "next_tables" : {
-            "act_15" : "node_62"
+            "act_14" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_act_14",
           "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7367,21 +8574,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
-          "actions" : ["act_14"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [61],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_14" : "tbl_act_18"
+            "act_13" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_act_15",
           "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7396,21 +8603,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
-          "actions" : ["act_17"],
+          "action_ids" : [64],
+          "actions" : ["act_16"],
           "base_default_next" : "node_66",
           "next_tables" : {
-            "act_17" : "node_66"
+            "act_16" : "node_66"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_16",
           "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7425,92 +8632,11 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_16"],
-          "base_default_next" : "tbl_act_18",
-          "next_tables" : {
-            "act_16" : "tbl_act_18"
-          },
-          "default_entry" : {
-            "action_id" : 59,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_18",
-          "id" : 38,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_69",
-          "next_tables" : {
-            "act_19" : "node_69"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_19",
-          "id" : 39,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_71",
-          "next_tables" : {
-            "act_18" : "node_71"
-          },
-          "default_entry" : {
-            "action_id" : 61,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 40,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
           "action_ids" : [63],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_73",
+          "actions" : ["act_15"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_20" : "node_73"
+            "act_15" : "node_68"
           },
           "default_entry" : {
             "action_id" : 63,
@@ -7521,11 +8647,11 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 41,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 347,
-            "column" : 12,
+            "line" : 356,
+            "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -7535,14 +8661,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
+          "action_ids" : [55],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : null,
+          "base_default_next" : "node_71",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : null
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_71"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 55,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 39,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 359,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [65],
+          "actions" : ["act_17"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "act_17" : null
+          },
+          "default_entry" : {
+            "action_id" : 65,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7581,7 +8736,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_act_8",
           "false_next" : "node_46"
         },
         {
@@ -7607,7 +8762,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_act_9",
           "false_next" : "node_48"
         },
         {
@@ -7660,7 +8815,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_10",
           "false_next" : "node_50"
         },
         {
@@ -7788,7 +8943,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_13",
           "false_next" : "node_64"
         },
         {
@@ -7814,8 +8969,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_68"
         },
         {
           "name" : "node_64",
@@ -7857,8 +9012,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_15",
+          "false_next" : "node_68"
         },
         {
           "name" : "node_66",
@@ -7883,17 +9038,17 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_68"
         },
         {
-          "name" : "node_69",
+          "name" : "node_68",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 354,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
           },
           "expression" : {
             "type" : "expression",
@@ -7912,44 +9067,20 @@
               },
               "right" : {
                 "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_71"
-        },
-        {
-          "name" : "node_71",
-          "id" : 27,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_egress_hasReturned"]
-                  }
-                }
+                "value" : false
               }
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_20"
+          "true_next" : "node_69"
         },
         {
-          "name" : "node_73",
-          "id" : 28,
+          "name" : "node_69",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
-            "column" : 12,
+            "line" : 355,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
           "expression" : {
@@ -7973,8 +9104,41 @@
               }
             }
           },
+          "true_next" : "tbl_spgw_egress_gtpu_encap",
+          "false_next" : "node_71"
+        },
+        {
+          "name" : "node_71",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 358,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr34"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
           "false_next" : null,
-          "true_next" : "tbl_spgw_egress_gtpu_encap"
+          "true_next" : "tbl_act_17"
         }
       ]
     }
@@ -8011,7 +9175,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 375,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index 0db6431..c96bbda 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -447,6 +447,9 @@
   action_refs {
     id: 16787606
   }
+  action_refs {
+    id: 16801146
+  }
   const_default_action_id: 16834935
   size: 2048
 }
@@ -822,30 +825,39 @@
 }
 actions {
   preamble {
-    id: 16829280
-    name: "FabricIngress.spgw_ingress.decap_inner_tcp"
-    alias: "decap_inner_tcp"
+    id: 16801146
+    name: "FabricIngress.spgw_ingress.load_dbuf_far_attributes"
+    alias: "load_dbuf_far_attributes"
   }
-}
-actions {
-  preamble {
-    id: 16815878
-    name: "FabricIngress.spgw_ingress.decap_inner_udp"
-    alias: "decap_inner_udp"
+  params {
+    id: 1
+    name: "drop"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16801274
-    name: "FabricIngress.spgw_ingress.decap_inner_icmp"
-    alias: "decap_inner_icmp"
+  params {
+    id: 2
+    name: "notify_cp"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16830582
-    name: "FabricIngress.spgw_ingress.decap_inner_unknown"
-    alias: "decap_inner_unknown"
+  params {
+    id: 3
+    name: "tunnel_src_port"
+    bitwidth: 16
+  }
+  params {
+    id: 4
+    name: "tunnel_src_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 5
+    name: "tunnel_dst_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 6
+    name: "teid"
+    bitwidth: 32
   }
 }
 actions {
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 972af8e..31302f6 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -2387,7 +2387,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 127,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -2466,7 +2466,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }