Fabric.p4 cherry-picks from onos-2.2

Publish fabric.p4 constants with fabric-api artifact

For consumption by third-party apps who wish to operate directly on
fabric.p4 tables and other entities.

(cherry picked from commit 8f6b5cdabf7828f6f7c017f288aad87c7bd0911a)

Backport fabric-tna dbuf support to v1model
(cherry picked from commit 4d1d67fa3abb4d7517e5836fbb82c899acffa951)

Update SPGW p4 namespace to match fabric-tna
(cherry picked from commit 35e4d196eb61104e7f96c62361a100bb454ee1cf)

Change-Id: I3230a508a601180060e1041d4369a54f519658e1
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..2cca7f8 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_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],
@@ -42,36 +41,34 @@
         ["fabric_metadata_t._ipv4_dst_addr20", 32, false],
         ["fabric_metadata_t._inner_l4_sport21", 16, false],
         ["fabric_metadata_t._inner_l4_dport22", 16, false],
-        ["fabric_metadata_t._spgw_direction23", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len24", 16, false],
-        ["fabric_metadata_t._spgw_teid25", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_port26", 16, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr27", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr28", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id29", 32, false],
-        ["fabric_metadata_t._spgw_far_id30", 32, false],
-        ["fabric_metadata_t._spgw_src_iface31", 8, false],
-        ["fabric_metadata_t._spgw_skip_spgw32", 1, false],
-        ["fabric_metadata_t._spgw_pdr_hit33", 1, false],
-        ["fabric_metadata_t._spgw_far_dropped34", 1, false],
-        ["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],
-        ["_padding_0", 6, false]
+        ["fabric_metadata_t._spgw_ipv4_len23", 16, false],
+        ["fabric_metadata_t._spgw_teid24", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_src_port25", 16, false],
+        ["fabric_metadata_t._spgw_tunnel_src_addr26", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_dst_addr27", 32, false],
+        ["fabric_metadata_t._spgw_ctr_id28", 32, false],
+        ["fabric_metadata_t._spgw_far_id29", 32, false],
+        ["fabric_metadata_t._spgw_src_iface30", 8, false],
+        ["fabric_metadata_t._spgw_skip_spgw31", 1, false],
+        ["fabric_metadata_t._spgw_notify_spgwc32", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_encap33", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_decap34", 1, false],
+        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr35", 1, false],
+        ["fabric_metadata_t._bng_type36", 2, false],
+        ["fabric_metadata_t._bng_line_id37", 32, false],
+        ["fabric_metadata_t._bng_pppoe_session_id38", 16, false],
+        ["fabric_metadata_t._bng_ds_meter_result39", 32, false],
+        ["fabric_metadata_t._bng_s_tag40", 12, false],
+        ["fabric_metadata_t._bng_c_tag41", 12, false],
+        ["fabric_metadata_t._int_meta_source42", 1, false],
+        ["fabric_metadata_t._int_meta_transit43", 1, false],
+        ["fabric_metadata_t._int_meta_sink44", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id45", 32, false],
+        ["fabric_metadata_t._int_meta_new_words46", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes47", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp48", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp49", 32, false],
+        ["_padding_0", 2, false]
       ]
     },
     {
@@ -802,7 +799,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -840,7 +837,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -861,7 +858,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag40"]
                 },
                 {
                   "type" : "field",
@@ -874,7 +871,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -900,7 +897,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -921,7 +918,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag41"]
                 },
                 {
                   "type" : "field",
@@ -1087,7 +1084,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -1119,7 +1116,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -2018,11 +2015,11 @@
       "is_direct" : false
     },
     {
-      "name" : "FabricIngress.spgw_ingress.pdr_counter",
+      "name" : "FabricIngress.spgw.pdr_counter",
       "id" : 19,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 180,
+        "line" : 109,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2066,11 +2063,11 @@
       }
     },
     {
-      "name" : "FabricEgress.spgw_egress.pdr_counter",
+      "name" : "FabricEgress.spgw.pdr_counter",
       "id" : 23,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 301,
+        "line" : 286,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2146,7 +2143,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -2345,16 +2342,28 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "name" : "NoAction",
       "id" : 13,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 14,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "id" : 15,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source44"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source42"]
             },
             {
               "type" : "expression",
@@ -2382,7 +2391,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_sink",
-      "id" : 14,
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2390,7 +2399,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
             },
             {
               "type" : "expression",
@@ -2418,7 +2427,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
-      "id" : 15,
+      "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2468,7 +2477,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2482,7 +2491,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
-      "id" : 16,
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2490,7 +2499,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2499,7 +2508,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 161,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2523,7 +2532,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
-      "id" : 17,
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2531,7 +2540,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2540,7 +2549,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 161,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2564,7 +2573,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
-      "id" : 18,
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2581,7 +2590,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2610,7 +2619,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2624,7 +2633,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v6",
-      "id" : 19,
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2641,7 +2650,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 119,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -2670,7 +2679,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2684,7 +2693,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.set_session",
-      "id" : 20,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "pppoe_session_id",
@@ -2697,7 +2706,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2706,7 +2715,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2716,7 +2725,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
             },
             {
               "type" : "runtime_data",
@@ -2739,7 +2748,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2753,7 +2762,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.drop",
-      "id" : 21,
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2761,7 +2770,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2770,7 +2779,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2784,7 +2793,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2813,31 +2822,31 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
-      "id" : 22,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
-      "id" : 23,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
       "id" : 24,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
+      "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
       "id" : 25,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.bng_ingress.set_line",
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
       "id" : 26,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
+      "id" : 27,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.set_line",
+      "id" : 28,
       "runtime_data" : [
         {
           "name" : "line_id",
@@ -2850,7 +2859,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "runtime_data",
@@ -2868,7 +2877,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 27,
+      "id" : 29,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2933,13 +2942,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 28,
+      "id" : 30,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 29,
+      "id" : 31,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -2970,7 +2979,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 30,
+      "id" : 32,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -3001,7 +3010,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 31,
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3032,7 +3041,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 32,
+      "id" : 34,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3082,43 +3091,6 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 30,
-            "column" : 32,
-            "source_fragment" : "= next_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 34,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
       "id" : 35,
       "runtime_data" : [
         {
@@ -3149,8 +3121,45 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.set_next_id_acl",
+      "name" : "FabricIngress.forwarding.nop_routing_v4",
       "id" : 36,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
+      "id" : 37,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.set_next_id_acl",
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3181,7 +3190,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 37,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3236,7 +3245,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 38,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -3267,7 +3276,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 39,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3318,13 +3327,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 40,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 41,
+      "id" : 43,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -3355,7 +3364,7 @@
     },
     {
       "name" : "FabricIngress.next.set_double_vlan",
-      "id" : 42,
+      "id" : 44,
       "runtime_data" : [
         {
           "name" : "outer_vlan_id",
@@ -3439,7 +3448,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
+              "value" : ["scalars", "fabric_metadata_t._bng_s_tag40"]
             },
             {
               "type" : "runtime_data",
@@ -3458,7 +3467,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
+              "value" : ["scalars", "fabric_metadata_t._bng_c_tag41"]
             },
             {
               "type" : "runtime_data",
@@ -3476,68 +3485,6 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 43,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 31,
-            "column" : 5,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 44,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 115,
-            "column" : 32,
-            "source_fragment" : "= next_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_simple",
       "id" : 45,
       "runtime_data" : [
         {
@@ -3568,10 +3515,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.routing_simple",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
       "id" : 46,
       "runtime_data" : [
         {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 115,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_simple",
+      "id" : 47,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.routing_simple",
+      "id" : 48,
+      "runtime_data" : [
+        {
           "name" : "port_num",
           "bitwidth" : 9
         },
@@ -3646,7 +3655,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_simple",
-      "id" : 47,
+      "id" : 49,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3746,7 +3755,7 @@
     },
     {
       "name" : "FabricIngress.next.output_hashed",
-      "id" : 48,
+      "id" : 50,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3777,7 +3786,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_hashed",
-      "id" : 49,
+      "id" : 51,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3854,7 +3863,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 50,
+      "id" : 52,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3954,7 +3963,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 51,
+      "id" : 53,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -4013,20 +4022,1666 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_source_iface",
-      "id" : 52,
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
+      "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" : 118,
+            "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.decap_gtpu_from_dbuf.decap_inner_udp",
+      "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" : 118,
+            "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.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "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" : 118,
+            "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.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "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" : 118,
+            "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.decap_gtpu.decap_inner_tcp",
+      "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" : 118,
+            "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.decap_gtpu.decap_inner_udp",
+      "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" : 118,
+            "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.decap_gtpu.decap_inner_icmp",
+      "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" : 118,
+            "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.decap_gtpu.decap_inner_unknown",
+      "id" : 61,
+      "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" : 118,
+            "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.load_iface",
+      "id" : 62,
       "runtime_data" : [
         {
           "name" : "src_iface",
           "bitwidth" : 8
-        },
-        {
-          "name" : "direction",
-          "bitwidth" : 2
-        },
-        {
-          "name" : "skip_spgw",
-          "bitwidth" : 1
         }
       ],
       "primitives" : [
@@ -4035,7 +5690,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface31"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
             },
             {
               "type" : "runtime_data",
@@ -4044,7 +5699,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 50,
+            "line" : 121,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -4054,26 +5709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction23"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 51,
-            "column" : 33,
-            "source_fragment" : "= direction; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw32"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
             },
             {
               "type" : "expression",
@@ -4083,18 +5719,8 @@
                   "op" : "b2d",
                   "left" : null,
                   "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 2
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
+                    "type" : "bool",
+                    "value" : false
                   }
                 }
               }
@@ -4102,16 +5728,71 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 52,
+            "line" : 122,
             "column" : 33,
-            "source_fragment" : "= (bool)skip_spgw; ..."
+            "source_fragment" : "= false; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 53,
+      "name" : "FabricIngress.spgw.iface_miss",
+      "id" : 63,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 44,
+            "source_fragment" : "8w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 126,
+            "column" : 33,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 64,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -4132,36 +5813,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit33"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -4170,7 +5822,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4180,7 +5832,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id30"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -4189,7 +5841,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4199,7 +5851,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -4228,7 +5880,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4236,8 +5888,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 54,
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 65,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -4258,36 +5910,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit33"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -4296,7 +5919,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4306,7 +5929,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id30"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -4315,7 +5938,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4325,7 +5948,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -4354,7 +5977,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4362,8 +5985,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 55,
+      "name" : "FabricIngress.spgw.load_normal_far",
+      "id" : 66,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -4380,7 +6003,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -4409,8 +6032,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 138,
-            "column" : 35,
+            "line" : 186,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -4419,7 +6042,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc35"]
+              "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" : 187,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
             },
             {
               "type" : "expression",
@@ -4448,7 +6110,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 139,
+            "line" : 188,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4456,8 +6118,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 56,
+      "name" : "FabricIngress.spgw.load_tunnel_far",
+      "id" : 67,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -4490,7 +6152,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -4519,8 +6181,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 148,
-            "column" : 35,
+            "line" : 197,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -4529,7 +6191,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc35"]
+              "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" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
             },
             {
               "type" : "expression",
@@ -4558,7 +6259,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 149,
+            "line" : 199,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4568,7 +6269,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap36"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
             },
             {
               "type" : "expression",
@@ -4587,7 +6288,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 201,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -4597,7 +6298,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
             },
             {
               "type" : "runtime_data",
@@ -4606,7 +6307,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 202,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -4616,7 +6317,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
             },
             {
               "type" : "runtime_data",
@@ -4625,7 +6326,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 203,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4635,7 +6336,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
             },
             {
               "type" : "runtime_data",
@@ -4644,7 +6345,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 204,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4654,7 +6355,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr28"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
             },
             {
               "type" : "runtime_data",
@@ -4663,7 +6364,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 205,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4682,7 +6383,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 207,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4701,7 +6402,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 158,
+            "line" : 208,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4720,7 +6421,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 209,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4739,7 +6440,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 210,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -4747,27 +6448,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
-      "id" : 57,
-      "runtime_data" : [],
+      "name" : "FabricIngress.spgw.load_dbuf_far",
+      "id" : 68,
+      "runtime_data" : [
+        {
+          "name" : "drop",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "notify_cp",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "tunnel_src_port",
+          "bitwidth" : 16
+        },
+        {
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "teid",
+          "bitwidth" : 32
+        }
+      ],
       "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" : 197,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -4775,18 +6521,38 @@
           "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" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -4794,199 +6560,67 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
             },
             {
-              "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"
+              "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" : 199,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
           }
         },
         {
-          "op" : "assign_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "tcp"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
             },
             {
-              "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"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 201,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_tcp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "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"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -4994,18 +6628,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "runtime_data",
+              "value" : 5
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 202,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -5013,18 +6647,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "line" : 203,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -5032,18 +6666,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "line" : 204,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -5051,165 +6685,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
             },
             {
-              "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" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_udp"
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "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"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -5220,15 +6707,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" : 207,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -5239,15 +6726,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" : 208,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -5258,15 +6745,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" : 209,
             "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -5277,158 +6764,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" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "hexstr",
+              "value" : "0x0868"
             }
           ],
           "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; ..."
+            "source_fragment" : "= 2152; ..."
           }
         },
         {
@@ -5436,146 +6780,35 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr35"]
             },
             {
-              "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" : 216,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "line" : 221,
+            "column" : 43,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 61,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5655,7 +6888,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 62,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5663,7 +6896,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
+              "value" : ["scalars", "spgw_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 71,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_tmp"]
             },
             {
               "type" : "expression",
@@ -5684,44 +6947,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" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5729,17 +6956,17 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricIngress.spgw_ingress.pdr_counter"
+              "value" : "FabricIngress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
+            "line" : 256,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -5747,7 +6974,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 65,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5755,72 +6982,7 @@
           "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,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
             },
             {
               "type" : "field",
@@ -5829,16 +6991,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 273,
+            "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 67,
+      "name" : "act_4",
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5901,8 +7063,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 68,
+      "name" : "act_5",
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5965,8 +7127,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 69,
+      "name" : "act_6",
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5991,8 +7153,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 70,
+      "name" : "act_7",
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6000,7 +7162,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -6036,7 +7198,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
@@ -6049,8 +7211,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 71,
+      "name" : "act_8",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6107,8 +7269,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 72,
+      "name" : "act_9",
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6133,8 +7295,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 73,
+      "name" : "act_10",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6163,8 +7325,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 74,
+      "name" : "act_11",
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6193,8 +7355,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 75,
+      "name" : "act_12",
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6202,7 +7364,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -6211,7 +7373,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 164,
+            "line" : 162,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -6242,8 +7404,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 76,
+      "name" : "act_13",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6278,8 +7440,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 77,
+      "name" : "act_14",
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6291,7 +7453,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6304,8 +7466,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 78,
+      "name" : "act_15",
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6317,7 +7479,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6330,8 +7492,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 79,
+      "name" : "act_16",
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6389,8 +7551,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 80,
+      "name" : "act_17",
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6419,8 +7581,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 81,
+      "name" : "act_18",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6449,8 +7611,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 82,
+      "name" : "act_19",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6462,11 +7624,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6479,8 +7641,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 83,
+      "name" : "act_20",
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6492,11 +7654,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6509,8 +7671,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 84,
+      "name" : "act_21",
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6522,11 +7684,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6539,8 +7701,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 85,
+      "name" : "act_22",
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6552,11 +7714,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6570,43 +7732,43 @@
     },
     {
       "name" : "nop",
-      "id" : 86,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 87,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 88,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 89,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 90,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 91,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v4",
-      "id" : 92,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6623,7 +7785,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 122,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6709,7 +7871,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
             }
           ],
           "source_info" : {
@@ -6728,7 +7890,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6794,7 +7956,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 124,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -6803,7 +7965,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v6",
-      "id" : 93,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6820,7 +7982,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 122,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6906,7 +8068,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
             }
           ],
           "source_info" : {
@@ -6925,7 +8087,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6991,7 +8153,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 125,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -7000,7 +8162,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 94,
+      "id" : 101,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -7068,7 +8230,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 155,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -7486,7 +8648,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 161,
+            "line" : 151,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -7495,7 +8657,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 95,
+      "id" : 102,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -7508,7 +8670,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit45"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit43"]
             },
             {
               "type" : "expression",
@@ -7537,7 +8699,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             },
             {
               "type" : "runtime_data",
@@ -7555,13 +8717,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 96,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 97,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7635,7 +8797,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -7649,7 +8811,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7677,7 +8839,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -7691,7 +8853,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7718,7 +8880,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 98,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7760,7 +8922,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -7774,7 +8936,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7802,7 +8964,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -7816,7 +8978,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7843,7 +9005,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 99,
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7951,7 +9113,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -7965,7 +9127,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7993,7 +9155,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8007,7 +9169,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8034,7 +9196,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 100,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8121,7 +9283,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8135,7 +9297,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8163,7 +9325,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8177,7 +9339,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8204,7 +9366,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 101,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8357,7 +9519,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8371,7 +9533,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8399,7 +9561,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8413,7 +9575,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8440,7 +9602,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 102,
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8561,7 +9723,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8575,7 +9737,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8603,7 +9765,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8617,7 +9779,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8644,7 +9806,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 103,
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8831,7 +9993,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8845,7 +10007,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8873,7 +10035,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8887,7 +10049,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8914,7 +10076,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 104,
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8941,7 +10103,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -8956,7 +10118,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8970,7 +10132,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8998,7 +10160,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9012,7 +10174,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9039,7 +10201,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 105,
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9132,7 +10294,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9147,7 +10309,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9161,7 +10323,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9189,7 +10351,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9203,7 +10365,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9230,7 +10392,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 106,
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9291,7 +10453,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9306,7 +10468,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9320,7 +10482,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9348,7 +10510,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9362,7 +10524,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9389,7 +10551,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 107,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9516,7 +10678,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9531,7 +10693,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9545,7 +10707,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9573,7 +10735,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9587,7 +10749,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9614,7 +10776,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 108,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9720,7 +10882,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9735,7 +10897,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9749,7 +10911,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9777,7 +10939,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9791,7 +10953,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9818,7 +10980,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 109,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9990,7 +11152,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -10005,7 +11167,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10019,7 +11181,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10047,7 +11209,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10061,7 +11223,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10088,7 +11250,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 110,
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10228,7 +11390,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -10243,7 +11405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10257,7 +11419,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10285,7 +11447,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10299,7 +11461,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10326,7 +11488,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 111,
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10532,7 +11694,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -10547,7 +11709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10561,7 +11723,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10589,7 +11751,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10603,7 +11765,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10630,13 +11792,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 112,
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 113,
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10678,7 +11840,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10692,7 +11854,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10720,7 +11882,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10734,7 +11896,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10761,7 +11923,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 114,
+      "id" : 121,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10822,7 +11984,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10836,7 +11998,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10864,7 +12026,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10878,7 +12040,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10905,7 +12067,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 115,
+      "id" : 122,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11000,7 +12162,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11014,7 +12176,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11042,7 +12204,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11056,7 +12218,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11083,7 +12245,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 116,
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11148,7 +12310,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11162,7 +12324,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11190,7 +12352,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11204,7 +12366,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11231,7 +12393,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 117,
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11330,7 +12492,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11344,7 +12506,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11372,7 +12534,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11386,7 +12548,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11413,7 +12575,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 118,
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11531,7 +12693,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11545,7 +12707,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11573,7 +12735,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11587,7 +12749,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11614,7 +12776,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 119,
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11766,7 +12928,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11780,7 +12942,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11808,7 +12970,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11822,7 +12984,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11849,7 +13011,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 120,
+      "id" : 127,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11891,7 +13053,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11905,7 +13067,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11933,7 +13095,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11947,7 +13109,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11974,7 +13136,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 121,
+      "id" : 128,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12050,7 +13212,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12064,7 +13226,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12092,7 +13254,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12106,7 +13268,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12133,7 +13295,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 122,
+      "id" : 129,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12228,7 +13390,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12242,7 +13404,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12270,7 +13432,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12284,7 +13446,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12311,7 +13473,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 123,
+      "id" : 130,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12440,7 +13602,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12454,7 +13616,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12482,7 +13644,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12496,7 +13658,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12523,7 +13685,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 124,
+      "id" : 131,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12622,7 +13784,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12636,7 +13798,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12664,7 +13826,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12678,7 +13840,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12705,7 +13867,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 125,
+      "id" : 132,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12838,7 +14000,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12852,7 +14014,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12880,7 +14042,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12894,7 +14056,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12921,7 +14083,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 126,
+      "id" : 133,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13073,7 +14235,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -13087,7 +14249,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13115,7 +14277,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -13129,7 +14291,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13156,7 +14318,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 127,
+      "id" : 134,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13342,7 +14504,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -13356,7 +14518,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13384,7 +14546,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -13398,7 +14560,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13425,7 +14587,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 128,
+      "id" : 135,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -13531,7 +14693,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -13759,7 +14921,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 130,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -13945,7 +15107,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 171,
+            "line" : 161,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -14040,7 +15202,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 175,
+            "line" : 165,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -14087,7 +15249,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 129,
+      "id" : 136,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14132,7 +15294,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 130,
+      "id" : 137,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14463,7 +15625,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 131,
+      "id" : 138,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14504,7 +15666,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 132,
+      "id" : 139,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14612,7 +15774,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 116,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -14621,7 +15783,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 133,
+      "id" : 140,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14691,7 +15853,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14719,7 +15881,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 134,
+      "id" : 141,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14789,7 +15951,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14817,7 +15979,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_inner_vlan",
-      "id" : 135,
+      "id" : 142,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14906,7 +16068,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14925,7 +16087,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14934,7 +16096,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 136,
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14955,8 +16117,8 @@
       ]
     },
     {
-      "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 137,
+      "name" : "FabricEgress.spgw.gtpu_encap",
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14969,7 +16131,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 291,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -14988,7 +16150,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 292,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -15007,7 +16169,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 133,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -15026,7 +16188,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 294,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -15045,7 +16207,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 295,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -15087,7 +16249,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 296,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -15106,7 +16268,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 298,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -15125,7 +16287,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 299,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -15144,7 +16306,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 300,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -15163,7 +16325,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 146,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -15182,7 +16344,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 130,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -15196,12 +16358,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 303,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -15215,12 +16377,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr28"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 304,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -15239,7 +16401,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 305,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -15254,7 +16416,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -15268,12 +16430,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 323,
+            "line" : 308,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -15292,7 +16454,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -15316,7 +16478,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -15334,7 +16496,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 310,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -15353,7 +16515,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -15368,7 +16530,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -15387,7 +16549,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -15406,7 +16568,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -15425,7 +16587,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -15444,7 +16606,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -15463,7 +16625,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -15482,7 +16644,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -15501,7 +16663,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -15515,12 +16677,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -15534,12 +16696,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -15547,8 +16709,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 138,
+      "name" : "act_23",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15564,8 +16726,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 139,
+      "name" : "act_24",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15615,8 +16777,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 140,
+      "name" : "act_25",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15637,8 +16799,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 141,
+      "name" : "act_26",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15667,8 +16829,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 142,
+      "name" : "act_27",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15697,8 +16859,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 143,
+      "name" : "act_28",
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15719,8 +16881,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 144,
+      "name" : "act_29",
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15741,8 +16903,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 145,
+      "name" : "act_30",
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15790,8 +16952,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 146,
+      "name" : "act_31",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15812,8 +16974,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 147,
+      "name" : "act_32",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15861,8 +17023,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 148,
+      "name" : "act_33",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15883,8 +17045,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 149,
+      "name" : "act_34",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15932,74 +17094,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" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16007,25 +17103,25 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricEgress.spgw_egress.pdr_counter"
+              "value" : "FabricEgress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
+            "line" : 333,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
       ]
     },
     {
-      "name" : "act_39",
-      "id" : 153,
+      "name" : "act_36",
+      "id" : 158,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16054,8 +17150,8 @@
       ]
     },
     {
-      "name" : "act_40",
-      "id" : 154,
+      "name" : "act_37",
+      "id" : 159,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16090,8 +17186,8 @@
       ]
     },
     {
-      "name" : "act_41",
-      "id" : 155,
+      "name" : "act_38",
+      "id" : 160,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16117,7 +17213,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       }
                     }
                   },
@@ -16139,8 +17235,8 @@
       ]
     },
     {
-      "name" : "act_42",
-      "id" : 156,
+      "name" : "act_39",
+      "id" : 161,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16188,8 +17284,8 @@
       ]
     },
     {
-      "name" : "act_43",
-      "id" : 157,
+      "name" : "act_40",
+      "id" : 162,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16215,7 +17311,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       }
                     }
                   },
@@ -16237,8 +17333,8 @@
       ]
     },
     {
-      "name" : "act_44",
-      "id" : 158,
+      "name" : "act_41",
+      "id" : 163,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16264,7 +17360,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       }
                     }
                   },
@@ -16314,50 +17410,27 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
+          "action_ids" : [69],
           "actions" : ["act"],
-          "base_default_next" : "tbl_act_0",
+          "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
-            "act" : "tbl_act_0"
+            "act" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 69,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_0",
+          "name" : "FabricIngress.spgw.interfaces",
           "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"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.interface_lookup",
-          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 55,
+            "line" : 130,
             "column" : 10,
-            "source_fragment" : "interface_lookup"
+            "source_fragment" : "interfaces"
           },
           "key" : [
             {
@@ -16379,40 +17452,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
-          "base_default_next" : "node_6",
+          "action_ids" : [62, 63],
+          "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.spgw_ingress.set_source_iface" : "node_6"
-          },
-          "default_entry" : {
-            "action_id" : 52,
-            "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"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_8",
-          "next_tables" : {
-            "act_1" : "node_8"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
             "action_id" : 63,
@@ -16422,92 +17467,8 @@
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "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)"
-          },
+          "name" : "tbl_act_0",
+          "id" : 2,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16515,25 +17476,48 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_13",
+          "action_ids" : [70],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "act_2" : "node_13"
+            "act_0" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 70,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "id" : 7,
+          "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" : [71],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 71,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 75,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -16563,17 +17547,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" : [54, 55, 56, 57],
+          "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.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.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16582,7 +17566,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 233,
+                "line" : 89,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -16601,7 +17585,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 57,
+                "action_id" : 54,
                 "action_data" : []
               },
               "priority" : 1
@@ -16609,7 +17593,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 234,
+                "line" : 90,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -16628,7 +17612,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 58,
+                "action_id" : 55,
                 "action_data" : []
               },
               "priority" : 2
@@ -16636,7 +17620,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 91,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -16655,7 +17639,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 56,
                 "action_data" : []
               },
               "priority" : 3
@@ -16663,19 +17647,262 @@
           ]
         },
         {
-          "name" : "FabricIngress.spgw_ingress.far_lookup",
+          "name" : "FabricIngress.spgw.uplink_pdrs",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 168,
+            "column" : 10,
+            "source_fragment" : "uplink_pdrs"
+          },
+          "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" : [65, 14],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 14,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.downlink_pdrs",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 157,
+            "column" : 10,
+            "source_fragment" : "downlink_pdrs"
+          },
+          "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" : [64, 13],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 13,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 256,
+            "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" : [72],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_15",
+          "next_tables" : {
+            "act_2" : "node_15"
+          },
+          "default_entry" : {
+            "action_id" : 72,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 163,
+            "line" : 75,
             "column" : 10,
-            "source_fragment" : "far_lookup"
+            "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" : [58, 59, 60, 61],
+          "actions" : ["FabricIngress.spgw.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu.decap_inner_udp", "FabricIngress.spgw.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu.decap_inner_unknown"],
+          "base_default_next" : "FabricIngress.spgw.fars",
+          "next_tables" : {
+            "FabricIngress.spgw.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw.fars"
+          },
+          "default_entry" : {
+            "action_id" : 61,
+            "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" : 58,
+                "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" : 59,
+                "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" : 60,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw.fars",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 224,
+            "column" : 10,
+            "source_fragment" : "fars"
           },
           "key" : [
             {
               "match_type" : "exact",
               "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id30"],
+              "target" : ["scalars", "fabric_metadata_t._spgw_far_id29"],
               "mask" : null
             }
           ],
@@ -16685,56 +17912,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" : [66, 67, 68],
+          "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
+          "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.load_normal_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 66,
             "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" : 273,
+            "column" : 36,
             "source_fragment" : "="
           },
           "key" : [],
@@ -16744,21 +17943,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_4"],
+          "action_ids" : [73],
+          "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" : 73,
             "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 +17972,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_5"],
+          "action_ids" : [74],
+          "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" : 74,
             "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 +18001,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_6"],
+          "action_ids" : [75],
+          "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" : 75,
             "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 +18030,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [69],
-          "actions" : ["act_7"],
+          "action_ids" : [76],
+          "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" : 76,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16885,7 +18084,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27, 28, 29],
+          "action_ids" : [29, 30, 31],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -16894,7 +18093,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 27,
+            "action_id" : 29,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16941,14 +18140,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [30],
+          "action_ids" : [32],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_27",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 30,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -16983,7 +18182,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31, 4],
+          "action_ids" : [33, 4],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17020,7 +18219,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 5],
+          "action_ids" : [34, 5],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17057,7 +18256,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33, 34, 6],
+          "action_ids" : [35, 36, 6],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17095,7 +18294,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35, 7],
+          "action_ids" : [37, 7],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17198,7 +18397,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36, 37, 38, 39, 40],
+          "action_ids" : [38, 39, 40, 41, 42],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_37",
           "next_tables" : {
@@ -17209,7 +18408,7 @@
             "FabricIngress.acl.nop_acl" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17244,7 +18443,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43, 44, 9],
+          "action_ids" : [45, 46, 9],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -17282,7 +18481,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45, 46, 47, 10],
+          "action_ids" : [47, 48, 49, 10],
           "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -17322,7 +18521,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48, 49, 50, 11],
+          "action_ids" : [50, 51, 52, 11],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -17355,7 +18554,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51, 12],
+          "action_ids" : [53, 12],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -17392,7 +18591,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41, 42, 8],
+          "action_ids" : [43, 44, 8],
           "actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
           "base_default_next" : "node_43",
           "next_tables" : {
@@ -17408,7 +18607,7 @@
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_act_7",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -17423,21 +18622,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70],
-          "actions" : ["act_8"],
+          "action_ids" : [77],
+          "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" : 77,
             "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 +18651,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["act_9"],
+          "action_ids" : [78],
+          "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" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17488,7 +18687,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 0],
+          "action_ids" : [15, 0],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
@@ -17525,7 +18724,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 1],
+          "action_ids" : [16, 1],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
           "base_default_next" : "node_49",
           "next_tables" : {
@@ -17540,7 +18739,7 @@
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_act_9",
           "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -17555,14 +18754,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_10"],
+          "action_ids" : [79],
+          "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" : 79,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17581,13 +18780,13 @@
             {
               "match_type" : "exact",
               "name" : "s_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_s_tag42"],
+              "target" : ["scalars", "fabric_metadata_t._bng_s_tag40"],
               "mask" : null
             },
             {
               "match_type" : "exact",
               "name" : "c_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_c_tag43"],
+              "target" : ["scalars", "fabric_metadata_t._bng_c_tag41"],
               "mask" : null
             }
           ],
@@ -17597,21 +18796,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [26],
+          "action_ids" : [28],
           "actions" : ["FabricIngress.bng_ingress.set_line"],
           "base_default_next" : "node_52",
           "next_tables" : {
             "FabricIngress.bng_ingress.set_line" : "node_52"
           },
           "default_entry" : {
-            "action_id" : 26,
+            "action_id" : 28,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act_10",
           "id" : 32,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17626,14 +18825,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["act_13"],
+          "action_ids" : [82],
+          "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" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17668,12 +18867,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 2],
+          "action_ids" : [17, 2],
           "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 +18882,7 @@
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_act_11",
           "id" : 34,
           "key" : [],
           "match_type" : "exact",
@@ -17692,21 +18891,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_11"],
+          "action_ids" : [80],
+          "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" : 80,
             "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 +18914,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_12"],
+          "action_ids" : [81],
+          "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" : 81,
             "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 +18943,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["act_14"],
+          "action_ids" : [83],
+          "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" : 83,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17770,7 +18969,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -17792,22 +18991,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 16],
+          "action_ids" : [20, 18],
           "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" : {
-            "action_id" : 16,
+            "action_id" : 18,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_act_14",
           "id" : 38,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17822,21 +19021,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77],
-          "actions" : ["act_15"],
+          "action_ids" : [84],
+          "actions" : ["act_14"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "act_14" : null
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 84,
             "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 +19050,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79],
-          "actions" : ["act_17"],
+          "action_ids" : [86],
+          "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" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17877,7 +19076,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -17899,22 +19098,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 17],
+          "action_ids" : [21, 19],
           "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" : {
-            "action_id" : 17,
+            "action_id" : 19,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_16",
           "id" : 41,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17929,14 +19128,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [78],
-          "actions" : ["act_16"],
+          "action_ids" : [85],
+          "actions" : ["act_15"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_16" : null
+            "act_15" : null
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17955,7 +19154,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             }
           ],
@@ -17965,12 +19164,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [3, 20, 21],
+          "action_ids" : [3, 22, 23],
           "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 +19179,7 @@
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "tbl_act_17",
           "id" : 43,
           "key" : [],
           "match_type" : "exact",
@@ -17989,21 +19188,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [80],
-          "actions" : ["act_18"],
+          "action_ids" : [87],
+          "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" : 87,
             "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 +19211,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["act_19"],
+          "action_ids" : [88],
+          "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" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18038,7 +19237,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -18066,22 +19265,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 24],
+          "action_ids" : [24, 26],
           "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,
+            "action_id" : 26,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
+          "name" : "tbl_act_19",
           "id" : 46,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18096,21 +19295,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["act_20"],
+          "action_ids" : [89],
+          "actions" : ["act_19"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_20" : null
+            "act_19" : null
           },
           "default_entry" : {
-            "action_id" : 82,
+            "action_id" : 89,
             "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 +19324,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["act_21"],
+          "action_ids" : [90],
+          "actions" : ["act_20"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_21" : null
+            "act_20" : null
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18151,7 +19350,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -18173,22 +19372,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 25],
+          "action_ids" : [25, 27],
           "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,
+            "action_id" : 27,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
+          "name" : "tbl_act_21",
           "id" : 49,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18203,21 +19402,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
-          "actions" : ["act_22"],
+          "action_ids" : [91],
+          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_22" : null
+            "act_21" : null
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 91,
             "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 +19431,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["act_23"],
+          "action_ids" : [92],
+          "actions" : ["act_22"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_23" : null
+            "act_22" : null
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18306,72 +19505,58 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "tbl_act_0"
+          "false_next" : "FabricIngress.spgw.interfaces"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "spgw_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" : 246,
+            "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_iface30"]
               },
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "hexstr",
+                "value" : "0x03"
               }
             }
           },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_8"
+          "true_next" : "FabricIngress.spgw.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" : 250,
+            "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
           "expression" : {
@@ -18385,16 +19570,42 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "false_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+          "true_next" : "FabricIngress.spgw.uplink_pdrs",
+          "false_next" : "FabricIngress.spgw.downlink_pdrs"
         },
         {
           "name" : "node_13",
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
-            "column" : 12,
+            "line" : 255,
+            "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_iface30"]
+              },
+              "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" : 260,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
           "expression" : {
@@ -18408,7 +19619,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
                   }
                 }
               },
@@ -18418,41 +19629,8 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.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"
+          "true_next" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
+          "false_next" : "FabricIngress.spgw.fars"
         },
         {
           "name" : "node_19",
@@ -18474,7 +19652,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_act_4",
           "false_next" : "node_21"
         },
         {
@@ -18497,7 +19675,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_act_5",
           "false_next" : "node_23"
         },
         {
@@ -18527,7 +19705,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_act_6",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -18723,7 +19901,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
+          "true_next" : "tbl_act_7",
           "false_next" : "node_45"
         },
         {
@@ -18749,7 +19927,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_act_8",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
@@ -18772,7 +19950,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
                   }
                 }
               },
@@ -18782,7 +19960,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_act_9",
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
@@ -18805,7 +19983,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_10",
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
@@ -18822,7 +20000,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_13",
           "false_next" : "node_59"
         },
         {
@@ -18893,7 +20071,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_16"
+          "true_next" : "tbl_act_15"
         },
         {
           "name" : "node_70",
@@ -18972,7 +20150,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 +20165,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [138],
-          "actions" : ["act_24"],
+          "action_ids" : [145],
+          "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" : 145,
             "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 +20194,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [139],
-          "actions" : ["act_25"],
+          "action_ids" : [146],
+          "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" : 146,
             "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 +20223,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [140],
-          "actions" : ["act_26"],
+          "action_ids" : [147],
+          "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" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19074,14 +20252,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [131],
+          "action_ids" : [138],
           "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" : 138,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19103,14 +20281,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [132],
+          "action_ids" : [139],
           "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" : 139,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19132,14 +20310,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [133],
+          "action_ids" : [140],
           "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" : 140,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19161,21 +20339,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [135],
+          "action_ids" : [142],
           "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" : 142,
             "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 +20368,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [143],
-          "actions" : ["act_29"],
+          "action_ids" : [150],
+          "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" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19232,22 +20410,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [136, 89],
+          "action_ids" : [143, 96],
           "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" : 96,
             "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 +20434,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [141],
-          "actions" : ["act_27"],
+          "action_ids" : [148],
+          "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" : 148,
             "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 +20457,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [142],
-          "actions" : ["act_28"],
+          "action_ids" : [149],
+          "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" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19308,21 +20486,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [134],
+          "action_ids" : [141],
           "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" : 141,
             "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 +20515,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [145],
-          "actions" : ["act_31"],
+          "action_ids" : [152],
+          "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" : 152,
             "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 +20544,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [144],
-          "actions" : ["act_30"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [151],
+          "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" : 151,
             "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 +20573,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
-          "actions" : ["act_33"],
+          "action_ids" : [154],
+          "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" : 154,
             "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 +20602,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [146],
-          "actions" : ["act_32"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [153],
+          "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" : 153,
             "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 +20631,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149],
-          "actions" : ["act_35"],
+          "action_ids" : [156],
+          "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" : 156,
             "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,107 +20660,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
-          "actions" : ["act_34"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [155],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_113",
           "next_tables" : {
-            "act_34" : "tbl_act_36"
+            "act_33" : "node_113"
           },
           "default_entry" : {
-            "action_id" : 148,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_36",
+          "name" : "tbl_spgw_gtpu_encap",
           "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",
-          "next_tables" : {
-            "act_38" : "node_118"
-          },
-          "default_entry" : {
-            "action_id" : 152,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 72,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 347,
-            "column" : 12,
+            "line" : 330,
+            "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -19592,14 +20689,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [137],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_120",
+          "action_ids" : [144],
+          "actions" : ["FabricEgress.spgw.gtpu_encap"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_120"
+            "FabricEgress.spgw.gtpu_encap" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 137,
+            "action_id" : 144,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_35",
+          "id" : 70,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 333,
+            "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" : [157],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_118",
+          "next_tables" : {
+            "act_35" : "node_118"
+          },
+          "default_entry" : {
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19607,7 +20733,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 73,
+          "id" : 71,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 297,
@@ -19621,14 +20747,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
+          "action_ids" : [99],
           "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" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19636,7 +20762,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v6",
-          "id" : 74,
+          "id" : 72,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 302,
@@ -19650,14 +20776,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
+          "action_ids" : [100],
           "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" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19665,7 +20791,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 +20830,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94, 86],
+          "action_ids" : [101, 93],
           "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" : 93,
             "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 +20854,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
-          "actions" : ["act_39"],
+          "action_ids" : [158],
+          "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" : 158,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19743,7 +20869,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 +20890,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95, 87],
+          "action_ids" : [102, 94],
           "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" : 94,
             "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 +20920,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
-          "actions" : ["act_40"],
-          "base_default_next" : "node_133",
+          "action_ids" : [159],
+          "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" : 159,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19809,7 +20935,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 +20956,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" : [103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 97],
           "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 +20979,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 97,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -19873,7 +20999,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 103,
                 "action_data" : []
               },
               "priority" : 1
@@ -19892,7 +21018,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 104,
                 "action_data" : []
               },
               "priority" : 2
@@ -19911,7 +21037,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 105,
                 "action_data" : []
               },
               "priority" : 3
@@ -19930,7 +21056,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 106,
                 "action_data" : []
               },
               "priority" : 4
@@ -19949,7 +21075,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 107,
                 "action_data" : []
               },
               "priority" : 5
@@ -19968,7 +21094,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 108,
                 "action_data" : []
               },
               "priority" : 6
@@ -19987,7 +21113,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 109,
                 "action_data" : []
               },
               "priority" : 7
@@ -20006,7 +21132,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 103,
+                "action_id" : 110,
                 "action_data" : []
               },
               "priority" : 8
@@ -20025,7 +21151,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 111,
                 "action_data" : []
               },
               "priority" : 9
@@ -20044,7 +21170,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 112,
                 "action_data" : []
               },
               "priority" : 10
@@ -20063,7 +21189,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 11
@@ -20082,7 +21208,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 12
@@ -20101,7 +21227,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 13
@@ -20120,7 +21246,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 14
@@ -20139,7 +21265,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 15
@@ -20158,7 +21284,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 16
@@ -20167,7 +21293,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 +21314,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" : [119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 98],
           "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" : 98,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20231,7 +21357,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 1
@@ -20250,7 +21376,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 2
@@ -20269,7 +21395,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 3
@@ -20288,7 +21414,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 4
@@ -20307,7 +21433,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 5
@@ -20326,7 +21452,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 6
@@ -20345,7 +21471,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 118,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 7
@@ -20364,7 +21490,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 119,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 8
@@ -20383,7 +21509,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 120,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 9
@@ -20402,7 +21528,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 121,
+                "action_id" : 128,
                 "action_data" : []
               },
               "priority" : 10
@@ -20421,7 +21547,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 122,
+                "action_id" : 129,
                 "action_data" : []
               },
               "priority" : 11
@@ -20440,7 +21566,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 123,
+                "action_id" : 130,
                 "action_data" : []
               },
               "priority" : 12
@@ -20459,7 +21585,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 124,
+                "action_id" : 131,
                 "action_data" : []
               },
               "priority" : 13
@@ -20478,7 +21604,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 125,
+                "action_id" : 132,
                 "action_data" : []
               },
               "priority" : 14
@@ -20497,7 +21623,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 126,
+                "action_id" : 133,
                 "action_data" : []
               },
               "priority" : 15
@@ -20516,7 +21642,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 127,
+                "action_id" : 134,
                 "action_data" : []
               },
               "priority" : 16
@@ -20524,8 +21650,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 +21665,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
-          "actions" : ["act_42"],
-          "base_default_next" : "node_137",
+          "action_ids" : [161],
+          "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" : 161,
             "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 +21694,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
-          "actions" : ["act_41"],
-          "base_default_next" : "node_139",
+          "action_ids" : [160],
+          "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" : 160,
             "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 +21723,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [157],
-          "actions" : ["act_43"],
-          "base_default_next" : "node_141",
+          "action_ids" : [162],
+          "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" : 162,
             "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 +21752,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["act_44"],
-          "base_default_next" : "node_143",
+          "action_ids" : [163],
+          "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" : 163,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20641,7 +21767,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 +21781,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [128, 88],
+          "action_ids" : [135, 95],
           "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" : 95,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20671,7 +21797,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 +21811,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [129],
+          "action_ids" : [136],
           "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" : 136,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20700,7 +21826,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 +21840,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [130],
+          "action_ids" : [137],
           "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" : 137,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20760,7 +21886,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
+          "true_next" : "tbl_act_23",
           "false_next" : "node_83"
         },
         {
@@ -20786,7 +21912,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
+          "true_next" : "tbl_act_24",
           "false_next" : "node_85"
         },
         {
@@ -20839,7 +21965,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_26",
+          "true_next" : "tbl_act_25",
           "false_next" : "node_87"
         },
         {
@@ -20922,7 +22048,7 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "tbl_act_27"
+          "false_next" : "tbl_act_26"
         },
         {
           "name" : "node_98",
@@ -21000,7 +22126,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_30",
+          "true_next" : "tbl_act_29",
           "false_next" : "node_105"
         },
         {
@@ -21026,8 +22152,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 +22195,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_32",
+          "true_next" : "tbl_act_31",
           "false_next" : "node_109"
         },
         {
@@ -21095,8 +22221,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 +22264,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 +22290,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" : 328,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
           },
           "expression" : {
             "type" : "expression",
@@ -21187,50 +22313,26 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw32"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
                   }
                 }
               },
               "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" : 329,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
           "expression" : {
@@ -21244,7 +22346,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap36"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
                   }
                 }
               },
@@ -21254,11 +22356,44 @@
               }
             }
           },
-          "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_120"
+          "true_next" : "tbl_spgw_gtpu_encap",
+          "false_next" : "node_116"
         },
         {
-          "name" : "node_120",
+          "name" : "node_116",
+          "id" : 42,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 332,
+            "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_ctr35"]
+                  }
+                }
+              },
+              "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 +22407,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+                "value" : ["scalars", "fabric_metadata_t._bng_type36"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -21280,11 +22415,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 +22439,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 +22462,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 +22542,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 +22564,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source44"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source42"]
                   }
                 }
               },
@@ -21440,10 +22575,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 +22598,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 +22620,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit45"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit43"]
                   }
                 }
               },
@@ -21495,11 +22630,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 +22655,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 +22677,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 +22700,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 +22723,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 +22750,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 +22772,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
                   }
                 }
               },
@@ -21685,7 +22820,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },