Backport fabric-spgw TNA changes to v1model

This branch ports the SPGW pipeline of fabric-tna back to v1model to
make the tables and actions consistent across the two versions. This
consistency will allow for testing of ONOS apps on both software and
hardware targets, since the only available software target that works
with ONOS requires v1model p4 programs. Changes to the fabric testing
suite (fabric-p4test) will be pushed in parallel.

Change-Id: Iad393b27f08a4fcd29f82e59d181871475ef2b10
diff --git a/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index 1de4248..509226a 100644
--- a/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -53,53 +53,51 @@
             PiMatchFieldId.of("ipv6_src");
     public static final PiMatchFieldId HDR_ETH_SRC =
             PiMatchFieldId.of("eth_src");
-    public static final PiMatchFieldId HDR_FAR_ID = PiMatchFieldId.of("far_id");
+    public static final PiMatchFieldId HDR_S_TAG = PiMatchFieldId.of("s_tag");
     public static final PiMatchFieldId HDR_VLAN_ID =
             PiMatchFieldId.of("vlan_id");
-    public static final PiMatchFieldId HDR_ICMP_CODE =
-            PiMatchFieldId.of("icmp_code");
     public static final PiMatchFieldId HDR_ETH_DST =
             PiMatchFieldId.of("eth_dst");
-    public static final PiMatchFieldId HDR_S_TAG = PiMatchFieldId.of("s_tag");
+    public static final PiMatchFieldId HDR_ICMP_TYPE =
+            PiMatchFieldId.of("icmp_type");
     public static final PiMatchFieldId HDR_IPV4_DST =
             PiMatchFieldId.of("ipv4_dst");
     public static final PiMatchFieldId HDR_IPV6_TRAFFIC_CLASS =
             PiMatchFieldId.of("ipv6_traffic_class");
-    public static final PiMatchFieldId HDR_IPV4_PREFIX =
-            PiMatchFieldId.of("ipv4_prefix");
+    public static final PiMatchFieldId HDR_TUNNEL_IPV4_DST =
+            PiMatchFieldId.of("tunnel_ipv4_dst");
     public static final PiMatchFieldId HDR_ETH_TYPE =
             PiMatchFieldId.of("eth_type");
-    public static final PiMatchFieldId HDR_PPPOE_SESSION_ID =
-            PiMatchFieldId.of("pppoe_session_id");
+    public static final PiMatchFieldId HDR_GTPU_IS_VALID =
+            PiMatchFieldId.of("gtpu_is_valid");
+    public static final PiMatchFieldId HDR_NEXT_ID =
+            PiMatchFieldId.of("next_id");
     public static final PiMatchFieldId HDR_IP_ETH_TYPE =
             PiMatchFieldId.of("ip_eth_type");
     public static final PiMatchFieldId HDR_L4_SPORT =
             PiMatchFieldId.of("l4_sport");
-    public static final PiMatchFieldId HDR_ICMP_TYPE =
-            PiMatchFieldId.of("icmp_type");
+    public static final PiMatchFieldId HDR_ICMP_CODE =
+            PiMatchFieldId.of("icmp_code");
     public static final PiMatchFieldId HDR_INNER_VLAN_ID =
             PiMatchFieldId.of("inner_vlan_id");
     public static final PiMatchFieldId HDR_IPV4_ECN =
             PiMatchFieldId.of("ipv4_ecn");
-    public static final PiMatchFieldId HDR_TUNNEL_IPV4_DST =
-            PiMatchFieldId.of("tunnel_ipv4_dst");
+    public static final PiMatchFieldId HDR_PPPOE_SESSION_ID =
+            PiMatchFieldId.of("pppoe_session_id");
     public static final PiMatchFieldId HDR_EG_SPEC =
             PiMatchFieldId.of("eg_spec");
+    public static final PiMatchFieldId HDR_IPV4_DST_ADDR =
+            PiMatchFieldId.of("ipv4_dst_addr");
     public static final PiMatchFieldId HDR_LINE_ID =
             PiMatchFieldId.of("line_id");
-    public static final PiMatchFieldId HDR_SPGW_DIRECTION =
-            PiMatchFieldId.of("spgw_direction");
     public static final PiMatchFieldId HDR_IPV4_DSCP =
             PiMatchFieldId.of("ipv4_dscp");
-    public static final PiMatchFieldId HDR_NEXT_ID =
-            PiMatchFieldId.of("next_id");
+    public static final PiMatchFieldId HDR_FAR_ID = PiMatchFieldId.of("far_id");
     public static final PiMatchFieldId HDR_EG_PORT =
             PiMatchFieldId.of("eg_port");
     public static final PiMatchFieldId HDR_UE_ADDR =
             PiMatchFieldId.of("ue_addr");
     public static final PiMatchFieldId HDR_TEID = PiMatchFieldId.of("teid");
-    public static final PiMatchFieldId HDR_GTP_IPV4_DST =
-            PiMatchFieldId.of("gtp_ipv4_dst");
     public static final PiMatchFieldId HDR_INT_IS_VALID =
             PiMatchFieldId.of("int_is_valid");
     public static final PiMatchFieldId HDR_MPLS_LABEL =
@@ -149,14 +147,12 @@
             PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_term_v4");
     public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_TERM_V6 =
             PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_term_v6");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DOWNLINK_FILTER_TABLE =
-            PiTableId.of("FabricIngress.spgw_ingress.downlink_filter_table");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_FLEXIBLE_PDR_LOOKUP =
-            PiTableId.of("FabricIngress.spgw_ingress.flexible_pdr_lookup");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UPLINK_FILTER_TABLE =
-            PiTableId.of("FabricIngress.spgw_ingress.uplink_filter_table");
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
+            PiTableId.of("FabricIngress.forwarding.bridging");
     public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_LINE_SESSION_MAP =
             PiTableId.of("FabricIngress.bng_ingress.downstream.t_line_session_map");
+    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_INTERFACE_LOOKUP =
+            PiTableId.of("FabricIngress.spgw_ingress.interface_lookup");
     public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
             PiTableId.of("FabricEgress.egress_next.egress_vlan");
     public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK =
@@ -169,15 +165,13 @@
             PiTableId.of("FabricIngress.bng_ingress.downstream.t_qos_v6");
     public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_QOS_V4 =
             PiTableId.of("FabricIngress.bng_ingress.downstream.t_qos_v4");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
-            PiTableId.of("FabricIngress.forwarding.bridging");
     // Indirect Counter IDs
+    public static final PiCounterId FABRIC_EGRESS_SPGW_EGRESS_PDR_COUNTER =
+            PiCounterId.of("FabricEgress.spgw_egress.pdr_counter");
     public static final PiCounterId FABRIC_INGRESS_SPGW_INGRESS_PDR_COUNTER =
             PiCounterId.of("FabricIngress.spgw_ingress.pdr_counter");
     public static final PiCounterId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_C_LINE_TX =
             PiCounterId.of("FabricEgress.bng_egress.downstream.c_line_tx");
-    public static final PiCounterId FABRIC_EGRESS_SPGW_EGRESS_PDR_COUNTER =
-            PiCounterId.of("FabricEgress.spgw_egress.pdr_counter");
     public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_EGRESS_PORT_COUNTER =
             PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter");
     public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_C_DROPPED =
@@ -222,6 +216,8 @@
     public static final PiCounterId FABRIC_INGRESS_FORWARDING_MPLS_COUNTER =
             PiCounterId.of("FabricIngress.forwarding.mpls_counter");
     // Action IDs
+    public static final PiActionId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_ENCAP_V4 =
+            PiActionId.of("FabricEgress.bng_egress.downstream.encap_v4");
     public static final PiActionId FABRIC_INGRESS_NEXT_SET_NEXT_ID_XCONNECT =
             PiActionId.of("FabricIngress.next.set_next_id_xconnect");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_NOP_ROUTING_V4 =
@@ -240,8 +236,8 @@
             PiActionId.of("FabricIngress.next.set_double_vlan");
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INIT_METADATA =
             PiActionId.of("FabricEgress.process_int_main.process_int_transit.init_metadata");
-    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_LOAD_TUNNEL_FAR_ATTRIBUTES =
-            PiActionId.of("FabricIngress.spgw_ingress.load_tunnel_far_attributes");
+    public static final PiActionId FABRIC_INGRESS_ACL_DROP =
+            PiActionId.of("FabricIngress.acl.drop");
     public static final PiActionId FABRIC_INGRESS_ACL_SET_CLONE_SESSION_ID =
             PiActionId.of("FabricIngress.acl.set_clone_session_id");
     public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_PUNT_TO_CPU =
@@ -270,10 +266,14 @@
             PiActionId.of("FabricIngress.forwarding.set_next_id_routing_v6");
     public static final PiActionId FABRIC_INGRESS_NEXT_ROUTING_SIMPLE =
             PiActionId.of("FabricIngress.next.routing_simple");
-    public static final PiActionId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_ENCAP_V4 =
-            PiActionId.of("FabricEgress.bng_egress.downstream.encap_v4");
+    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_DECAP_INNER_TCP =
+            PiActionId.of("FabricIngress.spgw_ingress.decap_inner_tcp");
+    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_DECAP_INNER_ICMP =
+            PiActionId.of("FabricIngress.spgw_ingress.decap_inner_icmp");
     public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_HASHED =
             PiActionId.of("FabricIngress.next.output_hashed");
+    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_DECAP_INNER_UDP =
+            PiActionId.of("FabricIngress.spgw_ingress.decap_inner_udp");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT =
             PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
     public static final PiActionId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_ENCAP_V6 =
@@ -294,11 +294,15 @@
             PiActionId.of("FabricIngress.bng_ingress.upstream.term_enabled_v6");
     public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_TERM_ENABLED_V4 =
             PiActionId.of("FabricIngress.bng_ingress.upstream.term_enabled_v4");
+    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_DECAP_INNER_UNKNOWN =
+            PiActionId.of("FabricIngress.spgw_ingress.decap_inner_unknown");
     public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SOURCE =
             PiActionId.of("FabricIngress.process_set_source_sink.int_set_source");
     public static final PiActionId NOP = PiActionId.of("nop");
     public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE =
             PiActionId.of("FabricIngress.next.output_simple");
+    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_SOURCE_IFACE =
+            PiActionId.of("FabricIngress.spgw_ingress.set_source_iface");
     public static final PiActionId FABRIC_INGRESS_FILTERING_DENY =
             PiActionId.of("FabricIngress.filtering.deny");
     public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_SET_SESSION =
@@ -312,14 +316,16 @@
     public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
     public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_XCONNECT =
             PiActionId.of("FabricIngress.next.output_xconnect");
-    public static final PiActionId FABRIC_INGRESS_ACL_DROP =
-            PiActionId.of("FabricIngress.acl.drop");
+    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_LOAD_TUNNEL_FAR_ATTRIBUTES =
+            PiActionId.of("FabricIngress.spgw_ingress.load_tunnel_far_attributes");
     // Action Param IDs
     public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
     public static final PiActionParamId MON_PORT =
             PiActionParamId.of("mon_port");
     public static final PiActionParamId NOTIFY_CP =
             PiActionParamId.of("notify_cp");
+    public static final PiActionParamId SRC_IFACE =
+            PiActionParamId.of("src_iface");
     public static final PiActionParamId SWITCH_ID =
             PiActionParamId.of("switch_id");
     public static final PiActionParamId SMAC = PiActionParamId.of("smac");
@@ -329,14 +335,20 @@
     public static final PiActionParamId VLAN_ID = PiActionParamId.of("vlan_id");
     public static final PiActionParamId TUNNEL_SRC_ADDR =
             PiActionParamId.of("tunnel_src_addr");
+    public static final PiActionParamId TUNNEL_SRC_PORT =
+            PiActionParamId.of("tunnel_src_port");
     public static final PiActionParamId LABEL = PiActionParamId.of("label");
     public static final PiActionParamId SRC_IP = PiActionParamId.of("src_ip");
+    public static final PiActionParamId SKIP_SPGW =
+            PiActionParamId.of("skip_spgw");
     public static final PiActionParamId MON_MAC = PiActionParamId.of("mon_mac");
     public static final PiActionParamId NEXT_ID = PiActionParamId.of("next_id");
     public static final PiActionParamId INS_CNT = PiActionParamId.of("ins_cnt");
     public static final PiActionParamId SRC_MAC = PiActionParamId.of("src_mac");
     public static final PiActionParamId INNER_VLAN_ID =
             PiActionParamId.of("inner_vlan_id");
+    public static final PiActionParamId DIRECTION =
+            PiActionParamId.of("direction");
     public static final PiActionParamId PPPOE_SESSION_ID =
             PiActionParamId.of("pppoe_session_id");
     public static final PiActionParamId CTR_ID = PiActionParamId.of("ctr_id");
@@ -348,6 +360,8 @@
             PiActionParamId.of("fwd_type");
     public static final PiActionParamId OUTER_VLAN_ID =
             PiActionParamId.of("outer_vlan_id");
+    public static final PiActionParamId NEEDS_GTPU_DECAP =
+            PiActionParamId.of("needs_gtpu_decap");
     public static final PiActionParamId INS_MASK0407 =
             PiActionParamId.of("ins_mask0407");
     public static final PiActionParamId TEID = PiActionParamId.of("teid");
diff --git a/pipelines/fabric/impl/src/main/resources/fabric.p4 b/pipelines/fabric/impl/src/main/resources/fabric.p4
index 86bd764..9f6b27d 100644
--- a/pipelines/fabric/impl/src/main/resources/fabric.p4
+++ b/pipelines/fabric/impl/src/main/resources/fabric.p4
@@ -32,7 +32,7 @@
 #endif // WITH_PORT_COUNTER
 
 #ifdef WITH_SPGW
-#include "include/spgw.p4"
+#include "include/control/spgw.p4"
 #endif // WITH_SPGW
 
 #ifdef WITH_BNG
@@ -55,19 +55,17 @@
 #ifdef WITH_PORT_COUNTER
     PortCountersControl() port_counters_control;
 #endif // WITH_PORT_COUNTER
+#ifdef WITH_SPGW
+    SpgwIngress() spgw_ingress;
+#endif // WITH_SPGW
 
     apply {
         _PRE_INGRESS
-#ifdef WITH_SPGW
-        spgw_normalizer.apply(hdr.gtpu.isValid(), hdr.gtpu_ipv4, hdr.gtpu_udp,
-                              hdr.ipv4, hdr.udp, hdr.inner_ipv4, hdr.inner_udp);
-#endif // WITH_SPGW
         pkt_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
-        filtering.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
-        spgw_ingress.apply(hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,
-                           hdr.ipv4, hdr.udp, fabric_metadata, standard_metadata);
+        spgw_ingress.apply(hdr, fabric_metadata, standard_metadata);
 #endif // WITH_SPGW
+        filtering.apply(hdr, fabric_metadata, standard_metadata);
         if (fabric_metadata.skip_forwarding == _FALSE) {
             forwarding.apply(hdr, fabric_metadata, standard_metadata);
         }
@@ -96,14 +94,16 @@
 
     PacketIoEgress() pkt_io_egress;
     EgressNextControl() egress_next;
+#ifdef WITH_SPGW
+    SpgwEgress() spgw_egress;
+#endif // WITH_SPGW
 
     apply {
         _PRE_EGRESS
         pkt_io_egress.apply(hdr, fabric_metadata, standard_metadata);
         egress_next.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
-        spgw_egress.apply(hdr.ipv4, hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,
-                          fabric_metadata, standard_metadata);
+        spgw_egress.apply(hdr, fabric_metadata);
 #endif // WITH_SPGW
 #ifdef WITH_BNG
         bng_egress.apply(hdr, fabric_metadata, standard_metadata);
diff --git a/pipelines/fabric/impl/src/main/resources/include/checksum.p4 b/pipelines/fabric/impl/src/main/resources/include/checksum.p4
index a10a393..2496002 100644
--- a/pipelines/fabric/impl/src/main/resources/include/checksum.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/checksum.p4
@@ -18,7 +18,7 @@
 #define __CHECKSUM__
 
 #ifdef WITH_SPGW
-#include "spgw.p4"
+#include "control/spgw.p4"
 #endif // WITH_SPGW
 
 control FabricComputeChecksum(inout parsed_headers_t hdr,
diff --git a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4 b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
new file mode 100644
index 0000000..b1bbcaf
--- /dev/null
+++ b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
@@ -0,0 +1,408 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __SPGW__
+#define __SPGW__
+
+#define DEFAULT_PDR_CTR_ID 0
+#define DEFAULT_FAR_ID 0
+
+#ifndef MAX_UES
+#define MAX_UES        1024
+#endif // MAX_UES
+#define MAX_INTERFACES 128
+
+#define MAX_UPLINK_PDRS   MAX_UES
+#define MAX_DOWNLINK_PDRS MAX_UES
+#define MAX_PDR_COUNTERS  2 * MAX_UES
+#define MAX_FARS          2 * MAX_UES
+
+
+
+control SpgwIngress(inout parsed_headers_t hdr,
+                    inout fabric_metadata_t fabric_md,
+                    inout standard_metadata_t standard_metadata) {
+
+
+
+
+    //=============================//
+    //===== Interface Tables ======//
+    //=============================//
+
+    action set_source_iface(spgw_interface_t src_iface, direction_t direction,
+                            bit<1> skip_spgw) {
+        // Interface type can be access, core, n6_lan, etc (see InterfaceType enum)
+        // If interface is from the control plane, direction can be either up or down
+        fabric_md.spgw.src_iface = src_iface;
+        fabric_md.spgw.direction = direction;
+        fabric_md.spgw.skip_spgw = (_BOOL)skip_spgw;
+    }
+    // TODO: check also that gtpu.msgtype == GTP_GPDU... somewhere
+    table interface_lookup {
+        key = {
+            hdr.ipv4.dst_addr  : lpm    @name("ipv4_dst_addr");  // outermost header
+            hdr.gtpu.isValid() : exact  @name("gtpu_is_valid");
+        }
+        actions = {
+            set_source_iface;
+        }
+        const default_action = set_source_iface(SPGW_IFACE_UNKNOWN, SPGW_DIR_UNKNOWN, 1);
+        size = MAX_INTERFACES;
+    }
+
+
+    //=============================//
+    //===== PDR Tables ======//
+    //=============================//
+
+    action set_pdr_attributes(pdr_ctr_id_t ctr_id,
+                              far_id_t far_id,
+                              bit<1> needs_gtpu_decap) {
+        fabric_md.spgw.pdr_hit = _TRUE;
+        fabric_md.spgw.ctr_id = ctr_id;
+        fabric_md.spgw.far_id = far_id;
+        fabric_md.spgw.needs_gtpu_decap = (_BOOL)needs_gtpu_decap;
+    }
+
+    // These two tables scale well and cover the average case PDR
+    table downlink_pdr_lookup {
+        key = {
+            // only available ipv4 header
+            hdr.ipv4.dst_addr : exact @name("ue_addr");
+        }
+        actions = {
+            set_pdr_attributes;
+        }
+        const default_action = set_pdr_attributes(DEFAULT_PDR_CTR_ID, DEFAULT_FAR_ID, 0);
+        size = MAX_DOWNLINK_PDRS;
+    }
+    table uplink_pdr_lookup {
+        key = {
+            // tunnel_dst_addr will be static for Q2 target. Can remove if need more scaling
+            hdr.ipv4.dst_addr           : exact @name("tunnel_ipv4_dst");
+            hdr.gtpu.teid               : exact @name("teid");
+            hdr.inner_ipv4.src_addr     : exact @name("ue_addr");
+        }
+        actions = {
+            set_pdr_attributes;
+        }
+        const default_action = set_pdr_attributes(DEFAULT_PDR_CTR_ID, DEFAULT_FAR_ID, 0);
+        size = MAX_UPLINK_PDRS;
+    }
+    // This table scales poorly and covers uncommon PDRs
+    table flexible_pdr_lookup {
+        key = {
+            fabric_md.spgw.src_iface    : ternary @name("src_iface");
+            // GTPU
+            hdr.gtpu.isValid()          : ternary @name("gtpu_is_valid");
+            hdr.gtpu.teid               : ternary @name("teid");
+            // SDF
+            // outer 5-tuple
+            hdr.ipv4.src_addr           : ternary @name("ipv4_src");
+            hdr.ipv4.dst_addr           : ternary @name("ipv4_dst");
+            hdr.ipv4.protocol           : ternary @name("ip_proto");
+            fabric_md.l4_sport          : ternary @name("l4_sport");
+            fabric_md.l4_dport          : ternary @name("l4_dport");
+            // inner 5-tuple
+            hdr.inner_ipv4.src_addr     : ternary @name("inner_ipv4_src");
+            hdr.inner_ipv4.dst_addr     : ternary @name("inner_ipv4_dst");
+            hdr.inner_ipv4.protocol     : ternary @name("inner_ip_proto");
+            fabric_md.inner_l4_sport    : ternary @name("inner_l4_sport");
+            fabric_md.inner_l4_dport    : ternary @name("inner_l4_dport");
+        }
+        actions = {
+            set_pdr_attributes;
+        }
+        const default_action = set_pdr_attributes(DEFAULT_PDR_CTR_ID, DEFAULT_FAR_ID, 0);
+    }
+
+    //=============================//
+    //===== FAR Tables ======//
+    //=============================//
+
+    action load_normal_far_attributes(bit<1> drop,
+                                      bit<1> notify_cp) {
+        // general far attributes
+        fabric_md.spgw.far_dropped  = (_BOOL)drop;
+        fabric_md.spgw.notify_spgwc = (_BOOL)notify_cp;
+    }
+    action load_tunnel_far_attributes(bit<1>      drop,
+                                      bit<1>      notify_cp,
+                                      bit<16>   tunnel_src_port,
+                                      bit<32>   tunnel_src_addr,
+                                      bit<32>   tunnel_dst_addr,
+                                      teid_t    teid) {
+        // general far attributes
+        fabric_md.spgw.far_dropped  = (_BOOL)drop;
+        fabric_md.spgw.notify_spgwc = (_BOOL)notify_cp;
+        // GTP tunnel attributes
+        fabric_md.spgw.needs_gtpu_encap = _TRUE;
+        fabric_md.spgw.teid = teid;
+        fabric_md.spgw.tunnel_src_port = tunnel_src_port;
+        fabric_md.spgw.tunnel_src_addr = tunnel_src_addr;
+        fabric_md.spgw.tunnel_dst_addr = tunnel_dst_addr;
+        // update metadata for correct routing/hashing
+        fabric_md.ipv4_src_addr = tunnel_src_addr;
+        fabric_md.ipv4_dst_addr = tunnel_dst_addr;
+        fabric_md.l4_sport = tunnel_src_port;
+        fabric_md.l4_dport = UDP_PORT_GTPU;
+    }
+
+    table far_lookup {
+        key = {
+            fabric_md.spgw.far_id : exact @name("far_id");
+        }
+        actions = {
+            load_normal_far_attributes;
+            load_tunnel_far_attributes;
+        }
+        // default is drop and don't notify CP
+        const default_action = load_normal_far_attributes(1, 1);
+        size = MAX_FARS;
+    }
+
+    //=============================//
+    //===== Misc Things ======//
+    //=============================//
+    
+    counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
+
+
+    @hidden
+    action decap_inner_common() {
+        // Correct parser-set metadata to use the inner header values
+        fabric_md.ip_eth_type   = ETHERTYPE_IPV4;
+        fabric_md.ip_proto      = hdr.inner_ipv4.protocol;
+        fabric_md.ipv4_src_addr = hdr.inner_ipv4.src_addr;
+        fabric_md.ipv4_dst_addr = hdr.inner_ipv4.dst_addr;
+        fabric_md.l4_sport      = fabric_md.inner_l4_sport;
+        fabric_md.l4_dport      = fabric_md.inner_l4_dport;
+        // Move GTPU and inner L3 headers out
+        hdr.ipv4 = hdr.inner_ipv4;
+        hdr.inner_ipv4.setInvalid();
+        hdr.gtpu.setInvalid();
+    }
+    action decap_inner_tcp() {
+        decap_inner_common();
+        hdr.udp.setInvalid();
+        hdr.tcp = hdr.inner_tcp;
+        hdr.inner_tcp.setInvalid();
+    }
+    action decap_inner_udp() {
+        decap_inner_common();
+        hdr.udp = hdr.inner_udp;
+        hdr.inner_udp.setInvalid();
+    }
+    action decap_inner_icmp() {
+        decap_inner_common();
+        hdr.udp.setInvalid();
+        hdr.icmp = hdr.inner_icmp;
+        hdr.inner_icmp.setInvalid();
+    }
+    action decap_inner_unknown() {
+        decap_inner_common();
+        hdr.udp.setInvalid();
+    }
+    @hidden
+    table decap_gtpu {
+        key = {
+            hdr.inner_tcp.isValid()     : exact;
+            hdr.inner_udp.isValid()     : exact;
+            hdr.inner_icmp.isValid()    : exact;
+        }
+        actions = {
+            decap_inner_tcp;
+            decap_inner_udp;
+            decap_inner_icmp;
+            decap_inner_unknown;
+        }
+        const default_action = decap_inner_unknown;
+        const entries = {
+            (true,  false, false) : decap_inner_tcp();
+            (false, true,  false) : decap_inner_udp();
+            (false, false, true)  : decap_inner_icmp();
+        }
+    }
+
+
+    //=============================//
+    //===== Apply Block ======//
+    //=============================//
+    apply {
+
+        // Interfaces
+        interface_lookup.apply();
+
+        // If interface table missed, or the interface skips PDRs/FARs (TODO: is that a thing?)
+        if (fabric_md.spgw.skip_spgw == _TRUE) return;
+
+        // PDRs
+        // Currently only best-case PDR tables to make v1model-to-tofino compiler happy
+        if (hdr.gtpu.isValid()) {
+            uplink_pdr_lookup.apply();
+        } else {
+            downlink_pdr_lookup.apply();
+        }
+        // Inefficient PDR table if efficient tables missed
+        // Removed to make v1model-to-tofino compiler happy. Not removed in TNA port
+        //if (fabric_md.spgw.pdr_hit == _FALSE) {
+        //    flexible_pdr_lookup.apply();
+        //}
+        pdr_counter.count(fabric_md.spgw.ctr_id);
+
+        // GTPU Decapsulate
+        if (fabric_md.spgw.needs_gtpu_decap == _TRUE) { 
+            decap_gtpu.apply();
+        }
+
+        // FARs
+        // Load FAR info
+        far_lookup.apply();
+
+        if (fabric_md.spgw.notify_spgwc == _TRUE) {
+            // TODO: cpu clone action here
+        }
+        if (fabric_md.spgw.far_dropped == _TRUE) {
+            // Do dropping in the same way as fabric's filtering.p4, so we can traverse
+            // the ACL table, which is good for cases like DHCP.
+            fabric_md.skip_forwarding = _TRUE;
+            fabric_md.skip_next = _TRUE;
+        }
+
+        // Nothing to be done immediately for forwarding or encapsulation.
+        // Forwarding is done by other parts of fabric.p4, and
+        // encapsulation is done in the egress
+
+        // Needed for correct GTPU encapsulation in egress
+        fabric_md.spgw.ipv4_len = hdr.ipv4.total_len;
+    }
+}
+
+
+//====================================//
+//============== Egress ==============//
+//====================================//
+control SpgwEgress(
+        inout parsed_headers_t hdr,
+        inout fabric_metadata_t fabric_md) {
+
+    counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
+
+
+    @hidden
+    action gtpu_encap() {
+        hdr.gtpu_ipv4.setValid();
+        hdr.gtpu_ipv4.version = IP_VERSION_4;
+        hdr.gtpu_ipv4.ihl = IPV4_MIN_IHL;
+        hdr.gtpu_ipv4.dscp = 0;
+        hdr.gtpu_ipv4.ecn = 0;
+        hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len
+                + (IPV4_HDR_SIZE + UDP_HDR_SIZE + GTP_HDR_SIZE);
+        hdr.gtpu_ipv4.identification = 0x1513; /* From NGIC. TODO: Needs to be dynamic */
+        hdr.gtpu_ipv4.flags = 0;
+        hdr.gtpu_ipv4.frag_offset = 0;
+        hdr.gtpu_ipv4.ttl = DEFAULT_IPV4_TTL;
+        hdr.gtpu_ipv4.protocol = PROTO_UDP;
+        hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr;
+        hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr;
+        hdr.gtpu_ipv4.hdr_checksum = 0; // Updated later
+
+        hdr.gtpu_udp.setValid();
+        hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; 
+        hdr.gtpu_udp.dport = UDP_PORT_GTPU;
+        hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len
+                + (UDP_HDR_SIZE + GTP_HDR_SIZE);
+        hdr.gtpu_udp.checksum = 0; // Updated later, if WITH_SPGW_UDP_CSUM_UPDATE
+
+
+        hdr.outer_gtpu.setValid();
+        hdr.outer_gtpu.version = GTPU_VERSION;
+        hdr.outer_gtpu.pt = GTP_PROTOCOL_TYPE_GTP;
+        hdr.outer_gtpu.spare = 0;
+        hdr.outer_gtpu.ex_flag = 0;
+        hdr.outer_gtpu.seq_flag = 0;
+        hdr.outer_gtpu.npdu_flag = 0;
+        hdr.outer_gtpu.msgtype = GTP_GPDU;
+        hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len;
+        hdr.outer_gtpu.teid = fabric_md.spgw.teid;
+    }
+
+    apply {
+        if (fabric_md.spgw.skip_spgw == _TRUE) return;
+        pdr_counter.count(fabric_md.spgw.ctr_id);
+
+        if (fabric_md.spgw.needs_gtpu_encap == _TRUE) {
+            gtpu_encap();
+        }
+    }
+}
+
+
+control update_gtpu_checksum(
+        inout ipv4_t gtpu_ipv4,
+        inout udp_t  gtpu_udp,
+        in    gtpu_t gtpu,
+        in    ipv4_t ipv4,
+        in    udp_t  udp
+    ) {
+    apply {
+        // Compute outer IPv4 checksum.
+        update_checksum(gtpu_ipv4.isValid(),
+            {
+                gtpu_ipv4.version,
+                gtpu_ipv4.ihl,
+                gtpu_ipv4.dscp,
+                gtpu_ipv4.ecn,
+                gtpu_ipv4.total_len,
+                gtpu_ipv4.identification,
+                gtpu_ipv4.flags,
+                gtpu_ipv4.frag_offset,
+                gtpu_ipv4.ttl,
+                gtpu_ipv4.protocol,
+                gtpu_ipv4.src_addr,
+                gtpu_ipv4.dst_addr
+            },
+            gtpu_ipv4.hdr_checksum,
+            HashAlgorithm.csum16
+        );
+
+#ifdef WITH_SPGW_UDP_CSUM_UPDATE
+        // Compute outer UDP checksum.
+        update_checksum_with_payload(gtpu_udp.isValid(),
+            {
+                gtpu_ipv4.src_addr,
+                gtpu_ipv4.dst_addr,
+                8w0,
+                gtpu_ipv4.protocol,
+                gtpu_udp.len,
+                gtpu_udp.sport,
+                gtpu_udp.dport,
+                gtpu_udp.len,
+                gtpu,
+                ipv4,
+                // FIXME: we are assuming only UDP for downlink packets
+                // How to conditionally switch between UDP/TCP/ICMP?
+                udp
+            },
+            gtpu_udp.checksum,
+            HashAlgorithm.csum16
+        );
+#endif // WITH_SPGW_UDP_CSUM_UPDATE
+    }
+}
+
+#endif
diff --git a/pipelines/fabric/impl/src/main/resources/include/define.p4 b/pipelines/fabric/impl/src/main/resources/include/define.p4
index 5dfcb95..bfb7b44 100644
--- a/pipelines/fabric/impl/src/main/resources/include/define.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/define.p4
@@ -97,13 +97,21 @@
 
 // SPGW types
 typedef bit<2> direction_t;
+typedef bit<8> spgw_interface_t;
 typedef bit pcc_gate_status_t;
 typedef bit<32> sdf_rule_id_t;
 typedef bit<32> pcc_rule_id_t;
 typedef bit<32> far_id_t;
-typedef bit<32> ctr_id_t;
+typedef bit<32> pdr_ctr_id_t;
 typedef bit<32> teid_t;
 
+const spgw_interface_t SPGW_IFACE_UNKNOWN = 8w0;
+const spgw_interface_t SPGW_IFACE_ACCESS = 8w1;
+const spgw_interface_t SPGW_IFACE_CORE = 8w2;
+const direction_t SPGW_DIR_UNKNOWN = 2w0;
+const direction_t SPGW_DIR_UPLINK = 2w1;
+const direction_t SPGW_DIR_DOWNLINK = 2w2;
+
 #ifndef S1U_SGW_PREFIX
 // By default spgw.p4 expects uplink packets with IP dst matching 140.0.0.0/8
 // FIXME: refactor pipeline to remove dependency on this value or allow setting it at runtime
@@ -147,13 +155,7 @@
 const bit<8> DEFAULT_MPLS_TTL = 64;
 const bit<8> DEFAULT_IPV4_TTL = 64;
 
-const sdf_rule_id_t DEFAULT_SDF_RULE_ID = 0;
-const pcc_rule_id_t DEFAULT_PCC_RULE_ID = 0;
-const direction_t SPGW_DIR_UNKNOWN = 2w0;
-const direction_t SPGW_DIR_UPLINK = 2w1;
-const direction_t SPGW_DIR_DOWNLINK = 2w2;
-const pcc_gate_status_t PCC_GATE_OPEN = 1w0;
-const pcc_gate_status_t PCC_GATE_CLOSED = 1w1;
+
 
 /* indicate INT at LSB of DSCP */
 const bit<6> INT_DSCP = 0x1;
diff --git a/pipelines/fabric/impl/src/main/resources/include/header.p4 b/pipelines/fabric/impl/src/main/resources/include/header.p4
index decad94..17b36fe 100644
--- a/pipelines/fabric/impl/src/main/resources/include/header.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/header.p4
@@ -142,14 +142,18 @@
     direction_t       direction;
     bit<16>           ipv4_len;
     teid_t            teid;
+    bit<16>           tunnel_src_port;
     bit<32>           tunnel_src_addr;
     bit<32>           tunnel_dst_addr;
-    ctr_id_t          ctr_id;
+    pdr_ctr_id_t      ctr_id;
     far_id_t          far_id;
+    spgw_interface_t  src_iface;
+    _BOOL             skip_spgw;
     _BOOL             pdr_hit;
     _BOOL             far_dropped;
-    _BOOL             notify_cp;
-    _BOOL             outer_header_creation;
+    _BOOL             notify_spgwc;
+    _BOOL             needs_gtpu_encap;
+    _BOOL             needs_gtpu_decap;
 }
 #endif // WITH_SPGW
 
@@ -196,6 +200,8 @@
     bit<32>       ipv4_src_addr;
     bit<32>       ipv4_dst_addr;
 #ifdef WITH_SPGW
+    bit<16>       inner_l4_sport;
+    bit<16>       inner_l4_dport;
     spgw_meta_t   spgw;
 #endif // WITH_SPGW
 #ifdef WITH_BNG
@@ -220,9 +226,12 @@
 #ifdef WITH_SPGW
     ipv4_t gtpu_ipv4;
     udp_t gtpu_udp;
+    gtpu_t outer_gtpu;
     gtpu_t gtpu;
     ipv4_t inner_ipv4;
     udp_t inner_udp;
+    tcp_t inner_tcp;
+    icmp_t inner_icmp;
 #endif // WITH_SPGW
     ipv4_t ipv4;
 #ifdef WITH_IPV6
diff --git a/pipelines/fabric/impl/src/main/resources/include/parser.p4 b/pipelines/fabric/impl/src/main/resources/include/parser.p4
index efbb74a..de0a76b 100644
--- a/pipelines/fabric/impl/src/main/resources/include/parser.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/parser.p4
@@ -185,17 +185,6 @@
 
 #ifdef WITH_SPGW
     state parse_gtpu {
-        transition select(hdr.ipv4.dst_addr[31:32-S1U_SGW_PREFIX_LEN]) {
-            // Avoid parsing GTP and inner headers if we know this GTP packet
-            // is not to be processed by this switch.
-            // FIXME: use parser value sets when support is ready in ONOS.
-            // To set the S1U_SGW_PREFIX value at runtime.
-            S1U_SGW_PREFIX[31:32-S1U_SGW_PREFIX_LEN]: do_parse_gtpu;
-            default: accept;
-        }
-    }
-
-    state do_parse_gtpu {
         packet.extract(hdr.gtpu);
         transition parse_inner_ipv4;
     }
@@ -213,14 +202,26 @@
 
     state parse_inner_udp {
         packet.extract(hdr.inner_udp);
-        fabric_metadata.l4_sport = hdr.inner_udp.sport;
-        fabric_metadata.l4_dport = hdr.inner_udp.dport;
+        fabric_metadata.inner_l4_sport = hdr.inner_udp.sport;
+        fabric_metadata.inner_l4_dport = hdr.inner_udp.dport;
 #ifdef WITH_INT
         transition parse_int;
 #else
         transition accept;
 #endif // WITH_INT
     }
+
+        state parse_inner_tcp {
+        packet.extract(hdr.inner_tcp);
+        fabric_metadata.inner_l4_sport = hdr.inner_tcp.sport;
+        fabric_metadata.inner_l4_dport = hdr.inner_tcp.dport;
+        transition accept;
+    }
+
+        state parse_inner_icmp {
+        packet.extract(hdr.inner_icmp);
+        transition accept;
+    }
 #endif // WITH_SPGW
 
 #ifdef WITH_INT
@@ -288,7 +289,7 @@
 #ifdef WITH_SPGW
         packet.emit(hdr.gtpu_ipv4);
         packet.emit(hdr.gtpu_udp);
-        packet.emit(hdr.gtpu);
+        packet.emit(hdr.outer_gtpu);
 #endif // WITH_SPGW
         packet.emit(hdr.ipv4);
 #ifdef WITH_IPV6
@@ -297,6 +298,14 @@
         packet.emit(hdr.tcp);
         packet.emit(hdr.udp);
         packet.emit(hdr.icmp);
+#ifdef WITH_SPGW
+        // if we parsed a GTPU packet but did not decap it
+        packet.emit(hdr.gtpu);
+        packet.emit(hdr.inner_ipv4);
+        packet.emit(hdr.inner_tcp);
+        packet.emit(hdr.inner_udp);
+        packet.emit(hdr.inner_icmp);
+#endif // WITH_SPGW
 #ifdef WITH_INT
         packet.emit(hdr.intl4_shim);
         packet.emit(hdr.int_header);
diff --git a/pipelines/fabric/impl/src/main/resources/include/spgw.p4 b/pipelines/fabric/impl/src/main/resources/include/spgw.p4
deleted file mode 100644
index 0aa78c0..0000000
--- a/pipelines/fabric/impl/src/main/resources/include/spgw.p4
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __SPGW__
-#define __SPGW__
-
-#define MAX_PDR_COUNTERS 1024
-#define DEFAULT_PDR_CTR_ID 0
-#define DEFAULT_FAR_ID 0
-
-control spgw_normalizer(
-        in    bool   is_gtpu_encapped,
-        out   ipv4_t gtpu_ipv4,
-        out   udp_t  gtpu_udp,
-        inout ipv4_t ipv4,
-        inout udp_t  udp,
-        in    ipv4_t inner_ipv4,
-        in    udp_t  inner_udp
-    ) {
-    apply {
-        if (! is_gtpu_encapped) return;
-        gtpu_ipv4 = ipv4;
-        ipv4 = inner_ipv4;
-        gtpu_udp = udp;
-        if (inner_udp.isValid()) {
-            udp = inner_udp;
-        } else {
-            udp.setInvalid();
-        }
-    }
-}
-
-control spgw_ingress(
-        inout ipv4_t              gtpu_ipv4,
-        inout udp_t               gtpu_udp,
-        inout gtpu_t              gtpu,
-        inout ipv4_t              ipv4,
-        inout udp_t               udp,
-        inout fabric_metadata_t   fabric_meta,
-        inout standard_metadata_t standard_metadata
-    ) {
-
-    counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
-
-    @hidden
-    action gtpu_decap() {
-        // grab information from the tunnel that we'll need later
-        fabric_meta.spgw.teid = gtpu.teid;
-        fabric_meta.spgw.tunnel_dst_addr = gtpu_ipv4.dst_addr;
-        // update metadata src and dst addresses with the inner packet 
-        fabric_meta.ipv4_src_addr = ipv4.src_addr;
-        fabric_meta.ipv4_dst_addr = ipv4.dst_addr;
-        // decap
-        gtpu_ipv4.setInvalid();
-        gtpu_udp.setInvalid();
-        gtpu.setInvalid();
-
-    }
-
-    table downlink_filter_table {
-        key = {
-            // UE addr pool for downlink
-            ipv4.dst_addr : lpm @name("ipv4_prefix");
-        }
-        actions = {
-            nop();
-        }
-        const default_action = nop();
-    }
-
-    table uplink_filter_table {
-        key = {
-            // IP addresses of the S1U interfaces of this SPGW-U instance (when uplink)
-            gtpu_ipv4.dst_addr : exact @name("gtp_ipv4_dst");
-        }
-        actions = {
-            nop();
-        }
-        const default_action = nop();
-    }
-
-    action set_pdr_attributes(ctr_id_t ctr_id,
-                              far_id_t far_id) {
-        fabric_meta.spgw.pdr_hit = _TRUE;
-        fabric_meta.spgw.ctr_id = ctr_id;
-        fabric_meta.spgw.far_id = far_id;
-    }
-
-    // These two tables scale well and cover the average case PDR
-    table downlink_pdr_lookup {
-        key = {
-            ipv4.dst_addr : exact @name("ue_addr");
-        }
-        actions = {
-            set_pdr_attributes;
-        }
-    }
-    table uplink_pdr_lookup {
-        key = {
-            // tunnel_dst_addr will be static for Q2 target. Can remove if need more scaling
-            fabric_meta.spgw.tunnel_dst_addr  : exact @name("tunnel_ipv4_dst");
-            fabric_meta.spgw.teid          : exact @name("teid");
-            ipv4.src_addr                  : exact @name("ue_addr");
-        }
-        actions = {
-            set_pdr_attributes;
-        }
-    }
-    // This table scales poorly and covers uncommon PDRs
-    table flexible_pdr_lookup {
-        key = {
-            // Direction. Eventually change to interface
-            fabric_meta.spgw.direction    : ternary @name("spgw_direction");
-            // F-TEID
-            fabric_meta.spgw.tunnel_dst_addr : ternary @name("tunnel_ipv4_dst");
-            fabric_meta.spgw.teid            : ternary @name("teid");
-            // SDF (5-tuple)
-            ipv4.src_addr                 : ternary @name("ipv4_src");
-            ipv4.dst_addr                 : ternary @name("ipv4_dst");
-            ipv4.protocol                 : ternary @name("ip_proto");
-            fabric_meta.l4_sport          : ternary @name("l4_sport");
-            fabric_meta.l4_dport          : ternary @name("l4_dport");
-        }
-        actions = {
-            set_pdr_attributes;
-        }
-        const default_action = set_pdr_attributes(DEFAULT_PDR_CTR_ID, DEFAULT_FAR_ID);
-    }
-
-    action load_normal_far_attributes(bit<1> drop,
-                                      bit<1> notify_cp) {
-        // general far attributes
-        fabric_meta.spgw.far_dropped = (_BOOL)drop;
-        fabric_meta.spgw.notify_cp   = (_BOOL)notify_cp;
-    }
-    action load_tunnel_far_attributes(bit<1>         drop,
-                                      bit<1>         notify_cp,
-                                      ipv4_addr_t    tunnel_src_addr,
-                                      ipv4_addr_t    tunnel_dst_addr,
-                                      teid_t         teid) {
-        // general far attributes
-        fabric_meta.spgw.far_dropped = (_BOOL)drop;
-        fabric_meta.spgw.notify_cp = (_BOOL)notify_cp;
-        // GTP tunnel attributes
-        fabric_meta.spgw.outer_header_creation = _TRUE;
-        fabric_meta.spgw.teid = teid;
-        fabric_meta.spgw.tunnel_src_addr = tunnel_src_addr;
-        fabric_meta.spgw.tunnel_dst_addr = tunnel_dst_addr;
-        // update metadata IP addresses for correct routing/hashing
-        fabric_meta.ipv4_src_addr = tunnel_src_addr;
-        fabric_meta.ipv4_dst_addr = tunnel_dst_addr;
-    }
-
-
-    table far_lookup {
-        key = {
-            fabric_meta.spgw.far_id : exact @name("far_id");
-        }
-        actions = {
-            load_normal_far_attributes;
-            load_tunnel_far_attributes;
-        }
-        // default is drop and don't notify CP
-        const default_action = load_normal_far_attributes(1w1, 1w0);
-    }
-
-    apply {
-        if (gtpu.isValid()) {
-            // If here, pkt has outer IP dst on
-            // S1U_SGW_PREFIX/S1U_SGW_PREFIX_LEN subnet.
-            // TODO: check also that gtpu.msgtype == GTP_GPDU
-            if (!uplink_filter_table.apply().hit) {
-                // Should this be changed to a forwarding/next skip instead of a drop?
-                mark_to_drop(standard_metadata);
-            }
-            fabric_meta.spgw.direction = SPGW_DIR_UPLINK;
-            gtpu_decap();
-        } else if (downlink_filter_table.apply().hit) {
-            fabric_meta.spgw.direction = SPGW_DIR_DOWNLINK;
-        } else {
-            fabric_meta.spgw.direction = SPGW_DIR_UNKNOWN;
-            // No SPGW processing needed.
-            return;
-        }
-
-        // Try the efficient PDR tables first (This PDR partitioning only works
-        // if the PDRs do not overlap. Will need fixing later.)
-        if (fabric_meta.spgw.direction == SPGW_DIR_UPLINK) {
-            uplink_pdr_lookup.apply();
-        } else if (fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK) {
-            downlink_pdr_lookup.apply();
-        } else { // SPGW_DIR_UNKNOWN
-            return;
-        }
-        // If those fail to find a match, use the wildcard tables
-        if (fabric_meta.spgw.pdr_hit == _FALSE) {
-            flexible_pdr_lookup.apply();
-        }
-
-        pdr_counter.count(fabric_meta.spgw.ctr_id);
-        // Load FAR info
-        far_lookup.apply();
-
-        if (fabric_meta.spgw.notify_cp == _TRUE) {
-            // TODO: cpu clone session here
-        }
-        if (fabric_meta.spgw.far_dropped == _TRUE) {
-            // Do dropping in the same way as fabric's filtering.p4, so we can traverse
-            // the ACL table, which is good for cases like DHCP.
-            fabric_meta.skip_forwarding = _TRUE;
-            fabric_meta.skip_next = _TRUE;
-        }
-
-        // Nothing to be done immediately for forwarding or encapsulation.
-        // Forwarding is done by other parts of fabric.p4, and
-        // encapsulation is done in the egress
-
-        // Needed for correct GTPU encapsulation in egress
-        fabric_meta.spgw.ipv4_len = ipv4.total_len;
-    }
-}
-
-
-control spgw_egress(
-        in    ipv4_t              ipv4,
-        inout ipv4_t              gtpu_ipv4,
-        inout udp_t               gtpu_udp,
-        inout gtpu_t              gtpu,
-        in    fabric_metadata_t   fabric_meta,
-        in    standard_metadata_t std_meta
-    ) {
-
-    counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
-
-
-    @hidden
-    action gtpu_encap() {
-        gtpu_ipv4.setValid();
-        gtpu_ipv4.version = IP_VERSION_4;
-        gtpu_ipv4.ihl = IPV4_MIN_IHL;
-        gtpu_ipv4.dscp = 0;
-        gtpu_ipv4.ecn = 0;
-        gtpu_ipv4.total_len = ipv4.total_len
-                + (IPV4_HDR_SIZE + UDP_HDR_SIZE + GTP_HDR_SIZE);
-        gtpu_ipv4.identification = 0x1513; /* From NGIC. TODO: Needs to be dynamic */
-        gtpu_ipv4.flags = 0;
-        gtpu_ipv4.frag_offset = 0;
-        gtpu_ipv4.ttl = DEFAULT_IPV4_TTL;
-        gtpu_ipv4.protocol = PROTO_UDP;
-        gtpu_ipv4.src_addr = fabric_meta.spgw.tunnel_src_addr;
-        gtpu_ipv4.dst_addr = fabric_meta.spgw.tunnel_dst_addr;
-        gtpu_ipv4.hdr_checksum = 0; // Updated later
-
-        gtpu_udp.setValid();
-        gtpu_udp.sport = UDP_PORT_GTPU; // TODO: make this dynamic per 3GPP specs
-        gtpu_udp.dport = UDP_PORT_GTPU;
-        gtpu_udp.len = fabric_meta.spgw.ipv4_len
-                + (UDP_HDR_SIZE + GTP_HDR_SIZE);
-        gtpu_udp.checksum = 0; // Updated later, if WITH_SPGW_UDP_CSUM_UPDATE
-
-
-        gtpu.setValid();
-        gtpu.version = GTPU_VERSION;
-        gtpu.pt = GTP_PROTOCOL_TYPE_GTP;
-        gtpu.spare = 0;
-        gtpu.ex_flag = 0;
-        gtpu.seq_flag = 0;
-        gtpu.npdu_flag = 0;
-        gtpu.msgtype = GTP_GPDU;
-        gtpu.msglen = fabric_meta.spgw.ipv4_len;
-        gtpu.teid = fabric_meta.spgw.teid;
-    }
-
-    apply {
-        pdr_counter.count(fabric_meta.spgw.ctr_id);
-
-        if (fabric_meta.spgw.outer_header_creation == _TRUE) {
-            gtpu_encap();
-        }
-    }
-}
-
-
-control update_gtpu_checksum(
-        inout ipv4_t gtpu_ipv4,
-        inout udp_t  gtpu_udp,
-        in    gtpu_t gtpu,
-        in    ipv4_t ipv4,
-        in    udp_t  udp
-    ) {
-    apply {
-        // Compute outer IPv4 checksum.
-        update_checksum(gtpu_ipv4.isValid(),
-            {
-                gtpu_ipv4.version,
-                gtpu_ipv4.ihl,
-                gtpu_ipv4.dscp,
-                gtpu_ipv4.ecn,
-                gtpu_ipv4.total_len,
-                gtpu_ipv4.identification,
-                gtpu_ipv4.flags,
-                gtpu_ipv4.frag_offset,
-                gtpu_ipv4.ttl,
-                gtpu_ipv4.protocol,
-                gtpu_ipv4.src_addr,
-                gtpu_ipv4.dst_addr
-            },
-            gtpu_ipv4.hdr_checksum,
-            HashAlgorithm.csum16
-        );
-
-#ifdef WITH_SPGW_UDP_CSUM_UPDATE
-        // Compute outer UDP checksum.
-        update_checksum_with_payload(gtpu_udp.isValid(),
-            {
-                gtpu_ipv4.src_addr,
-                gtpu_ipv4.dst_addr,
-                8w0,
-                gtpu_ipv4.protocol,
-                gtpu_udp.len,
-                gtpu_udp.sport,
-                gtpu_udp.dport,
-                gtpu_udp.len,
-                gtpu,
-                ipv4,
-                // FIXME: we are assuming only UDP for downlink packets
-                // How to conditionally switch between UDP/TCP/ICMP?
-                udp
-            },
-            gtpu_udp.checksum,
-            HashAlgorithm.csum16
-        );
-#endif // WITH_SPGW_UDP_CSUM_UPDATE
-    }
-}
-
-#endif
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index d30221f..33b9159 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -946,7 +946,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 267,
+        "line" : 268,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
@@ -1435,7 +1435,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 159,
+            "line" : 163,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -1476,7 +1476,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 128,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -1541,7 +1541,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 161,
+            "line" : 165,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -1605,7 +1605,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 161,
+            "line" : 165,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2963,7 +2963,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 160,
+            "line" : 164,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -3200,7 +3200,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -3371,7 +3371,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 134,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -3529,7 +3529,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 118,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -3608,7 +3608,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3706,7 +3706,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3823,7 +3823,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3842,7 +3842,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -5422,7 +5422,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 69,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -5533,7 +5533,7 @@
           "id" : 8,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 75,
+            "line" : 73,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -5747,7 +5747,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 93,
+        "line" : 91,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
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 7f6ef0d..e0d2c6a 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,22 +5,19 @@
       "id" : 0,
       "fields" : [
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_2", 16, false],
-        ["tmp_3", 16, false],
-        ["tmp_4", 4, false],
-        ["tmp", 8, false],
-        ["tmp_0", 32, false],
-        ["tmp_1", 32, false],
-        ["tmp_5", 32, false],
-        ["spgw_ingress_tmp", 1, false],
-        ["spgw_ingress_tmp_0", 1, false],
+        ["tmp_0", 16, false],
+        ["tmp_1", 16, false],
+        ["tmp_2", 4, false],
+        ["tmp", 32, false],
+        ["tmp_3", 32, false],
+        ["tmp_4", 32, false],
         ["bng_ingress_upstream_tmp", 1, false],
         ["bng_ingress_downstream_tmp", 1, false],
-        ["spgw_normalizer_hasReturned", 1, false],
         ["spgw_ingress_hasReturned", 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],
@@ -43,31 +40,37 @@
         ["fabric_metadata_t._l4_dport18", 16, false],
         ["fabric_metadata_t._ipv4_src_addr19", 32, false],
         ["fabric_metadata_t._ipv4_dst_addr20", 32, false],
-        ["fabric_metadata_t._spgw_direction21", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len22", 16, false],
-        ["fabric_metadata_t._spgw_teid23", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr24", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr25", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id26", 32, false],
-        ["fabric_metadata_t._spgw_far_id27", 32, false],
-        ["fabric_metadata_t._spgw_pdr_hit28", 1, false],
-        ["fabric_metadata_t._spgw_far_dropped29", 1, false],
-        ["fabric_metadata_t._spgw_notify_cp30", 1, false],
-        ["fabric_metadata_t._spgw_outer_header_creation31", 1, false],
-        ["fabric_metadata_t._bng_type32", 2, false],
-        ["fabric_metadata_t._bng_line_id33", 32, false],
-        ["fabric_metadata_t._bng_pppoe_session_id34", 16, false],
-        ["fabric_metadata_t._bng_ds_meter_result35", 32, false],
-        ["fabric_metadata_t._bng_s_tag36", 12, false],
-        ["fabric_metadata_t._bng_c_tag37", 12, false],
-        ["fabric_metadata_t._int_meta_source38", 1, false],
-        ["fabric_metadata_t._int_meta_transit39", 1, false],
-        ["fabric_metadata_t._int_meta_sink40", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id41", 32, false],
-        ["fabric_metadata_t._int_meta_new_words42", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes43", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp44", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp45", 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]
       ]
     },
@@ -192,22 +195,8 @@
       ]
     },
     {
-      "name" : "ipv6_t",
-      "id" : 10,
-      "fields" : [
-        ["version", 4, false],
-        ["traffic_class", 8, false],
-        ["flow_label", 20, false],
-        ["payload_len", 16, false],
-        ["next_hdr", 8, false],
-        ["hop_limit", 8, false],
-        ["src_addr", 128, false],
-        ["dst_addr", 128, false]
-      ]
-    },
-    {
       "name" : "tcp_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -224,7 +213,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -235,6 +224,20 @@
       ]
     },
     {
+      "name" : "ipv6_t",
+      "id" : 12,
+      "fields" : [
+        ["version", 4, false],
+        ["traffic_class", 8, false],
+        ["flow_label", 20, false],
+        ["payload_len", 16, false],
+        ["next_hdr", 8, false],
+        ["hop_limit", 8, false],
+        ["src_addr", 128, false],
+        ["dst_addr", 128, false]
+      ]
+    },
+    {
       "name" : "packet_out_header_t",
       "id" : 13,
       "fields" : [
@@ -444,190 +447,211 @@
       "pi_omit" : true
     },
     {
-      "name" : "gtpu",
+      "name" : "outer_gtpu",
       "id" : 10,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "inner_ipv4",
+      "name" : "gtpu",
       "id" : 11,
+      "header_type" : "gtpu_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "inner_ipv4",
+      "id" : 12,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
+      "name" : "inner_tcp",
+      "id" : 14,
+      "header_type" : "tcp_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "inner_icmp",
+      "id" : 15,
+      "header_type" : "icmp_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
       "name" : "ipv4",
-      "id" : 13,
+      "id" : 16,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv6",
-      "id" : 14,
+      "id" : 17,
       "header_type" : "ipv6_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 15,
+      "id" : 18,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 16,
+      "id" : 19,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 17,
+      "id" : 20,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 18,
+      "id" : 21,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 19,
+      "id" : 22,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ethernet",
-      "id" : 20,
+      "id" : 23,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_eth_type",
-      "id" : 21,
+      "id" : 24,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ipv4",
-      "id" : 22,
+      "id" : 25,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_udp",
-      "id" : 23,
+      "id" : 26,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_fixed_header",
-      "id" : 24,
+      "id" : 27,
       "header_type" : "report_fixed_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_shim",
-      "id" : 25,
+      "id" : 28,
       "header_type" : "intl4_shim_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_header",
-      "id" : 26,
+      "id" : 29,
       "header_type" : "int_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_switch_id",
-      "id" : 27,
+      "id" : 30,
       "header_type" : "int_switch_id_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_port_ids",
-      "id" : 28,
+      "id" : 31,
       "header_type" : "int_port_ids_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_hop_latency",
-      "id" : 29,
+      "id" : 32,
       "header_type" : "int_hop_latency_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_occupancy",
-      "id" : 30,
+      "id" : 33,
       "header_type" : "int_q_occupancy_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_ingress_tstamp",
-      "id" : 31,
+      "id" : 34,
       "header_type" : "int_ingress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tstamp",
-      "id" : 32,
+      "id" : 35,
       "header_type" : "int_egress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_congestion",
-      "id" : 33,
+      "id" : 36,
       "header_type" : "int_q_congestion_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tx_util",
-      "id" : 34,
+      "id" : 37,
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_data",
-      "id" : 35,
+      "id" : 38,
       "header_type" : "int_data_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_tail",
-      "id" : 36,
+      "id" : 39,
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
@@ -767,7 +791,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -805,7 +829,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
@@ -826,7 +850,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag36"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
                 },
                 {
                   "type" : "field",
@@ -839,7 +863,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_3"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -865,7 +889,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -886,7 +910,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag37"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
                 },
                 {
                   "type" : "field",
@@ -1052,7 +1076,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_4"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -1084,7 +1108,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_4"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -1410,77 +1434,6 @@
             {
               "parameters" : [
                 {
-                  "type" : "field",
-                  "value" : ["scalars", "tmp"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "&",
-                      "left" : {
-                        "type" : "expression",
-                        "value" : {
-                          "op" : "&",
-                          "left" : {
-                            "type" : "expression",
-                            "value" : {
-                              "op" : ">>",
-                              "left" : {
-                                "type" : "field",
-                                "value" : ["ipv4", "dst_addr"]
-                              },
-                              "right" : {
-                                "type" : "hexstr",
-                                "value" : "0x18"
-                              }
-                            }
-                          },
-                          "right" : {
-                            "type" : "hexstr",
-                            "value" : "0xffffffff"
-                          }
-                        }
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            }
-          ],
-          "transitions" : [
-            {
-              "type" : "hexstr",
-              "value" : "0x8c",
-              "mask" : null,
-              "next_state" : "do_parse_gtpu"
-            },
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp"]
-            }
-          ]
-        },
-        {
-          "name" : "do_parse_gtpu",
-          "id" : 14,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
                   "type" : "regular",
                   "value" : "gtpu"
                 }
@@ -1544,7 +1497,7 @@
         },
         {
           "name" : "parse_inner_udp",
-          "id" : 15,
+          "id" : 14,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1559,7 +1512,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+                  "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
                 },
                 {
                   "type" : "field",
@@ -1572,7 +1525,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+                  "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
                 },
                 {
                   "type" : "field",
@@ -1593,7 +1546,7 @@
         },
         {
           "name" : "parse_int",
-          "id" : 16,
+          "id" : 15,
           "parser_ops" : [],
           "transitions" : [
             {
@@ -1617,7 +1570,7 @@
         },
         {
           "name" : "parse_intl4_shim",
-          "id" : 17,
+          "id" : 16,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1660,13 +1613,13 @@
         },
         {
           "name" : "parse_int_data",
-          "id" : 18,
+          "id" : 17,
           "parser_ops" : [
             {
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp"]
                 },
                 {
                   "type" : "expression",
@@ -1738,7 +1691,7 @@
                   "type" : "expression",
                   "value" : {
                     "type" : "field",
-                    "value" : ["scalars", "tmp_0"]
+                    "value" : ["scalars", "tmp"]
                   }
                 }
               ],
@@ -1756,7 +1709,7 @@
         },
         {
           "name" : "parse_intl4_tail",
-          "id" : 19,
+          "id" : 18,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1787,11 +1740,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 267,
+        "line" : 268,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "report_ethernet", "report_eth_type", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
+      "order" : ["packet_in", "report_ethernet", "report_eth_type", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
     }
   ],
   "meter_arrays" : [
@@ -1826,20 +1779,8 @@
   ],
   "counter_arrays" : [
     {
-      "name" : "FabricIngress.spgw_ingress.pdr_counter",
-      "id" : 0,
-      "source_info" : {
-        "filename" : "include/spgw.p4",
-        "line" : 56,
-        "column" : 49,
-        "source_fragment" : "pdr_counter"
-      },
-      "size" : 1024,
-      "is_direct" : false
-    },
-    {
       "name" : "FabricIngress.process_set_source_sink.counter_set_source",
-      "id" : 1,
+      "id" : 0,
       "is_direct" : true,
       "binding" : "FabricIngress.process_set_source_sink.tb_set_source",
       "source_info" : {
@@ -1851,7 +1792,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.counter_set_sink",
-      "id" : 2,
+      "id" : 1,
       "is_direct" : true,
       "binding" : "FabricIngress.process_set_source_sink.tb_set_sink",
       "source_info" : {
@@ -1863,7 +1804,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.c_terminated",
-      "id" : 3,
+      "id" : 2,
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 36,
@@ -1875,7 +1816,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.c_dropped",
-      "id" : 4,
+      "id" : 3,
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 37,
@@ -1887,7 +1828,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.c_control",
-      "id" : 5,
+      "id" : 4,
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 38,
@@ -1899,7 +1840,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.c_line_rx",
-      "id" : 6,
+      "id" : 5,
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 152,
@@ -1911,7 +1852,7 @@
     },
     {
       "name" : "FabricIngress.filtering.ingress_port_vlan_counter",
-      "id" : 7,
+      "id" : 6,
       "is_direct" : true,
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
@@ -1923,7 +1864,7 @@
     },
     {
       "name" : "FabricIngress.filtering.fwd_classifier_counter",
-      "id" : 8,
+      "id" : 7,
       "is_direct" : true,
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
@@ -1935,7 +1876,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.bridging_counter",
-      "id" : 9,
+      "id" : 8,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
@@ -1947,7 +1888,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.mpls_counter",
-      "id" : 10,
+      "id" : 9,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
@@ -1959,7 +1900,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.routing_v6_counter",
-      "id" : 11,
+      "id" : 10,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.routing_v6",
       "source_info" : {
@@ -1971,7 +1912,7 @@
     },
     {
       "name" : "FabricIngress.acl.acl_counter",
-      "id" : 12,
+      "id" : 11,
       "is_direct" : true,
       "binding" : "FabricIngress.acl.acl",
       "source_info" : {
@@ -1983,7 +1924,7 @@
     },
     {
       "name" : "FabricIngress.next.next_vlan_counter",
-      "id" : 13,
+      "id" : 12,
       "is_direct" : true,
       "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
@@ -1995,7 +1936,7 @@
     },
     {
       "name" : "FabricIngress.next.xconnect_counter",
-      "id" : 14,
+      "id" : 13,
       "is_direct" : true,
       "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
@@ -2007,7 +1948,7 @@
     },
     {
       "name" : "FabricIngress.next.simple_counter",
-      "id" : 15,
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricIngress.next.simple",
       "source_info" : {
@@ -2019,7 +1960,7 @@
     },
     {
       "name" : "FabricIngress.next.hashed_counter",
-      "id" : 16,
+      "id" : 15,
       "is_direct" : true,
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
@@ -2031,7 +1972,7 @@
     },
     {
       "name" : "FabricIngress.next.multicast_counter",
-      "id" : 17,
+      "id" : 16,
       "is_direct" : true,
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
@@ -2043,7 +1984,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
-      "id" : 18,
+      "id" : 17,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 26,
@@ -2055,7 +1996,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 19,
+      "id" : 18,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 27,
@@ -2066,20 +2007,20 @@
       "is_direct" : false
     },
     {
-      "name" : "FabricEgress.spgw_egress.pdr_counter",
-      "id" : 20,
+      "name" : "FabricIngress.spgw_ingress.pdr_counter",
+      "id" : 19,
       "source_info" : {
-        "filename" : "include/spgw.p4",
-        "line" : 246,
-        "column" : 49,
+        "filename" : "include/control/spgw.p4",
+        "line" : 182,
+        "column" : 53,
         "source_fragment" : "pdr_counter"
       },
-      "size" : 1024,
+      "size" : 2048,
       "is_direct" : false
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.c_line_tx",
-      "id" : 21,
+      "id" : 20,
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 267,
@@ -2091,7 +2032,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 22,
+      "id" : 21,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -2103,7 +2044,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 23,
+      "id" : 22,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
@@ -2112,6 +2053,18 @@
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
+    },
+    {
+      "name" : "FabricEgress.spgw_egress.pdr_counter",
+      "id" : 23,
+      "source_info" : {
+        "filename" : "include/control/spgw.p4",
+        "line" : 303,
+        "column" : 53,
+        "source_fragment" : "pdr_counter"
+      },
+      "size" : 2048,
+      "is_direct" : false
     }
   ],
   "register_arrays" : [],
@@ -2181,8 +2134,8 @@
       "name" : "calc_0",
       "id" : 1,
       "source_info" : {
-        "filename" : "include/spgw.p4",
-        "line" : 306,
+        "filename" : "include/control/spgw.p4",
+        "line" : 364,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -2381,741 +2334,16 @@
       "primitives" : []
     },
     {
-      "name" : "nop",
+      "name" : "FabricIngress.process_set_source_sink.int_set_source",
       "id" : 13,
       "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 14,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 15,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 16,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.gtpu_decap",
-      "id" : 17,
-      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid23"]
-            },
-            {
-              "type" : "field",
-              "value" : ["gtpu", "teid"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 61,
-            "column" : 30,
-            "source_fragment" : "= gtpu.teid; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"]
-            },
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 62,
-            "column" : 41,
-            "source_fragment" : "= gtpu_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 64,
-            "column" : 34,
-            "source_fragment" : "= ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 65,
-            "column" : 34,
-            "source_fragment" : "= ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 67,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "gtpu_udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "gtpu.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 18,
-      "runtime_data" : [
-        {
-          "name" : "ctr_id",
-          "bitwidth" : 32
-        },
-        {
-          "name" : "far_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 98,
-            "column" : 32,
-            "source_fragment" : "= ctr_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id27"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 99,
-            "column" : 32,
-            "source_fragment" : "= far_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 19,
-      "runtime_data" : [
-        {
-          "name" : "ctr_id",
-          "bitwidth" : 32
-        },
-        {
-          "name" : "far_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 98,
-            "column" : 32,
-            "source_fragment" : "= ctr_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id27"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 99,
-            "column" : 32,
-            "source_fragment" : "= far_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 20,
-      "runtime_data" : [
-        {
-          "name" : "ctr_id",
-          "bitwidth" : 32
-        },
-        {
-          "name" : "far_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 98,
-            "column" : 32,
-            "source_fragment" : "= ctr_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id27"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 99,
-            "column" : 32,
-            "source_fragment" : "= far_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 21,
-      "runtime_data" : [
-        {
-          "name" : "drop",
-          "bitwidth" : 1
-        },
-        {
-          "name" : "notify_cp",
-          "bitwidth" : 1
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped29"]
-            },
-            {
-              "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/spgw.p4",
-            "line" : 146,
-            "column" : 37,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp30"]
-            },
-            {
-              "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/spgw.p4",
-            "line" : 147,
-            "column" : 35,
-            "source_fragment" : "= (bool)notify_cp; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 22,
-      "runtime_data" : [
-        {
-          "name" : "drop",
-          "bitwidth" : 1
-        },
-        {
-          "name" : "notify_cp",
-          "bitwidth" : 1
-        },
-        {
-          "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._spgw_far_dropped29"]
-            },
-            {
-              "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/spgw.p4",
-            "line" : 155,
-            "column" : 37,
-            "source_fragment" : "= (bool)drop; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp30"]
-            },
-            {
-              "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/spgw.p4",
-            "line" : 156,
-            "column" : 35,
-            "source_fragment" : "= (bool)notify_cp; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation31"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 158,
-            "column" : 47,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid23"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 4
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 159,
-            "column" : 30,
-            "source_fragment" : "= teid; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr24"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 160,
-            "column" : 41,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 161,
-            "column" : 41,
-            "source_fragment" : "= tunnel_dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 163,
-            "column" : 34,
-            "source_fragment" : "= tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 164,
-            "column" : 34,
-            "source_fragment" : "= tunnel_dst_addr; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 23,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source44"]
             },
             {
               "type" : "expression",
@@ -3143,7 +2371,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_sink",
-      "id" : 24,
+      "id" : 14,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3151,7 +2379,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink40"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
             },
             {
               "type" : "expression",
@@ -3179,7 +2407,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
-      "id" : 25,
+      "id" : 15,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3229,7 +2457,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -3243,7 +2471,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
-      "id" : 26,
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3251,7 +2479,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type32"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
             },
             {
               "type" : "hexstr",
@@ -3260,7 +2488,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 159,
+            "line" : 163,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -3284,7 +2512,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
-      "id" : 27,
+      "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3292,7 +2520,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type32"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
             },
             {
               "type" : "hexstr",
@@ -3301,7 +2529,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 159,
+            "line" : 163,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -3325,7 +2553,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
-      "id" : 28,
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3342,7 +2570,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 128,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3371,7 +2599,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -3385,7 +2613,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v6",
-      "id" : 29,
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3402,7 +2630,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 121,
+            "line" : 129,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -3431,7 +2659,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -3445,7 +2673,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.set_session",
-      "id" : 30,
+      "id" : 20,
       "runtime_data" : [
         {
           "name" : "pppoe_session_id",
@@ -3458,7 +2686,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type32"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
             },
             {
               "type" : "hexstr",
@@ -3467,7 +2695,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 161,
+            "line" : 165,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -3477,7 +2705,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id34"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
             },
             {
               "type" : "runtime_data",
@@ -3500,7 +2728,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -3514,7 +2742,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.drop",
-      "id" : 31,
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3522,7 +2750,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type32"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
             },
             {
               "type" : "hexstr",
@@ -3531,7 +2759,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 161,
+            "line" : 165,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -3545,7 +2773,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -3574,31 +2802,31 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
-      "id" : 32,
+      "id" : 22,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
-      "id" : 33,
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
-      "id" : 34,
+      "id" : 24,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
-      "id" : 35,
+      "id" : 25,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.bng_ingress.set_line",
-      "id" : 36,
+      "id" : 26,
       "runtime_data" : [
         {
           "name" : "line_id",
@@ -3611,7 +2839,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             },
             {
               "type" : "runtime_data",
@@ -3629,7 +2857,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 37,
+      "id" : 27,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3694,13 +2922,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 38,
+      "id" : 28,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 39,
+      "id" : 29,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -3731,7 +2959,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 40,
+      "id" : 30,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -3762,7 +2990,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 41,
+      "id" : 31,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3793,7 +3021,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 42,
+      "id" : 32,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3843,7 +3071,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 43,
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3874,13 +3102,13 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 44,
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
-      "id" : 45,
+      "id" : 35,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3911,7 +3139,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_next_id_acl",
-      "id" : 46,
+      "id" : 36,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3942,7 +3170,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 47,
+      "id" : 37,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3997,7 +3225,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 48,
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -4028,7 +3256,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 49,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4079,13 +3307,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 50,
+      "id" : 40,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 51,
+      "id" : 41,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -4116,7 +3344,7 @@
     },
     {
       "name" : "FabricIngress.next.set_double_vlan",
-      "id" : 52,
+      "id" : 42,
       "runtime_data" : [
         {
           "name" : "outer_vlan_id",
@@ -4200,7 +3428,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_s_tag36"]
+              "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
             },
             {
               "type" : "runtime_data",
@@ -4219,7 +3447,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_c_tag37"]
+              "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
             },
             {
               "type" : "runtime_data",
@@ -4237,7 +3465,7 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 53,
+      "id" : 43,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4268,7 +3496,7 @@
     },
     {
       "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 54,
+      "id" : 44,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -4299,7 +3527,7 @@
     },
     {
       "name" : "FabricIngress.next.output_simple",
-      "id" : 55,
+      "id" : 45,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4330,7 +3558,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_simple",
-      "id" : 56,
+      "id" : 46,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4407,7 +3635,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_simple",
-      "id" : 57,
+      "id" : 47,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4507,7 +3735,7 @@
     },
     {
       "name" : "FabricIngress.next.output_hashed",
-      "id" : 58,
+      "id" : 48,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4538,7 +3766,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_hashed",
-      "id" : 59,
+      "id" : 49,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4615,7 +3843,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 60,
+      "id" : 50,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4715,7 +3943,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 61,
+      "id" : 51,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -4774,16 +4002,126 @@
       ]
     },
     {
-      "name" : "act",
-      "id" : 62,
-      "runtime_data" : [],
+      "name" : "FabricIngress.spgw_ingress.set_source_iface",
+      "id" : 52,
+      "runtime_data" : [
+        {
+          "name" : "src_iface",
+          "bitwidth" : 8
+        },
+        {
+          "name" : "direction",
+          "bitwidth" : 2
+        },
+        {
+          "name" : "skip_spgw",
+          "bitwidth" : 1
+        }
+      ],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface31"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 50,
+            "column" : 33,
+            "source_fragment" : "= src_iface; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "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"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 2
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 33,
+            "source_fragment" : "= (bool)skip_spgw; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+      "id" : 53,
+      "runtime_data" : [
+        {
+          "name" : "ctr_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "far_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "needs_gtpu_decap",
+          "bitwidth" : 1
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit33"]
             },
             {
               "type" : "expression",
@@ -4801,47 +4139,10 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 34,
-            "column" : 32,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_0",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "fabric.p4",
-            "line" : 62,
-            "column" : 50,
-            "source_fragment" : "hdr.gtpu_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "fabric.p4",
-            "line" : 62,
-            "column" : 65,
-            "source_fragment" : "hdr.gtpu_udp"
+            "filename" : "include/control/spgw.p4",
+            "line" : 75,
+            "column" : 31,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -4849,7 +4150,104 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 76,
+            "column" : 30,
+            "source_fragment" : "= ctr_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id30"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 77,
+            "column" : 30,
+            "source_fragment" : "= far_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 2
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 78,
+            "column" : 40,
+            "source_fragment" : "= (bool)needs_gtpu_decap; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+      "id" : 54,
+      "runtime_data" : [
+        {
+          "name" : "ctr_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "far_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "needs_gtpu_decap",
+          "bitwidth" : 1
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit33"]
             },
             {
               "type" : "expression",
@@ -4860,85 +4258,600 @@
                   "left" : null,
                   "right" : {
                     "type" : "bool",
-                    "value" : false
+                    "value" : true
                   }
                 }
               }
             }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_1",
-      "id" : 64,
-      "runtime_data" : [],
-      "primitives" : [
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 75,
+            "column" : 31,
+            "source_fragment" : "= true; ..."
+          }
+        },
         {
-          "op" : "assign_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
             },
             {
-              "type" : "header",
-              "value" : "inner_udp"
+              "type" : "runtime_data",
+              "value" : 0
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 39,
-            "column" : 16,
-            "source_fragment" : "= inner_udp; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 76,
+            "column" : 30,
+            "source_fragment" : "= ctr_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id30"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 77,
+            "column" : 30,
+            "source_fragment" : "= far_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 2
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 78,
+            "column" : 40,
+            "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_2",
-      "id" : 65,
-      "runtime_data" : [],
+      "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
+      "id" : 55,
+      "runtime_data" : [
+        {
+          "name" : "drop",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "notify_cp",
+          "bitwidth" : 1
+        }
+      ],
       "primitives" : [
         {
-          "op" : "remove_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+            },
+            {
+              "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/spgw.p4",
-            "line" : 41,
-            "column" : 12,
-            "source_fragment" : "udp.setInvalid()"
+            "filename" : "include/control/spgw.p4",
+            "line" : 140,
+            "column" : 35,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc35"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 141,
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_3",
-      "id" : 66,
-      "runtime_data" : [],
+      "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
+      "id" : 56,
+      "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_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "gtpu_ipv4"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
             },
             {
-              "type" : "header",
-              "value" : "ipv4"
+              "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/spgw.p4",
-            "line" : 35,
-            "column" : 18,
-            "source_fragment" : "= ipv4; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 150,
+            "column" : 35,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc35"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 151,
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap36"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 153,
+            "column" : 40,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 5
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 154,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port26"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 155,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr27"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 156,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr28"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 157,
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 159,
+            "column" : 32,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 160,
+            "column" : 32,
+            "source_fragment" : "= tunnel_dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 161,
+            "column" : 27,
+            "source_fragment" : "= tunnel_src_port; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0868"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 162,
+            "column" : 27,
+            "source_fragment" : "= 2152; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
+      "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" : 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" : 189,
+            "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" : 190,
+            "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" : 191,
+            "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" : 192,
+            "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" : 193,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
           }
         },
         {
@@ -4954,10 +4867,55 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 36,
-            "column" : 13,
-            "source_fragment" : "= inner_ipv4; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 195,
+            "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" : 196,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 197,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 201,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
           }
         },
         {
@@ -4965,25 +4923,648 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "gtpu_udp"
+              "value" : "tcp"
             },
             {
               "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 202,
+            "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" : 203,
+            "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; ..."
+          }
+        },
+        {
+          "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" : 189,
+            "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" : 190,
+            "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" : 191,
+            "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" : 192,
+            "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" : 193,
+            "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" : 195,
+            "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" : 196,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 197,
+            "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" : 207,
+            "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" : 208,
+            "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" : 189,
+            "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" : 190,
+            "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" : 191,
+            "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" : 192,
+            "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" : 193,
+            "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" : 195,
+            "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" : 196,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 197,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
               "value" : "udp"
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 37,
-            "column" : 17,
-            "source_fragment" : "= udp; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 212,
+            "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" : 213,
+            "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" : 214,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
           }
         }
       ]
     },
     {
-      "name" : "act_4",
-      "id" : 67,
+      "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" : 189,
+            "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" : 190,
+            "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" : 191,
+            "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" : 192,
+            "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" : 193,
+            "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" : 195,
+            "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" : 196,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 197,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 218,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5062,8 +5643,191 @@
       ]
     },
     {
+      "name" : "act_0",
+      "id" : 62,
+      "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" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "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" : 251,
+            "column" : 46,
+            "source_fragment" : "return"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_2",
+      "id" : 64,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.spgw_ingress.pdr_counter"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_3",
+      "id" : 65,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 282,
+            "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" : 283,
+            "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"]
+            },
+            {
+              "type" : "field",
+              "value" : ["ipv4", "total_len"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 291,
+            "column" : 32,
+            "source_fragment" : "= hdr.ipv4.total_len; ..."
+          }
+        }
+      ]
+    },
+    {
       "name" : "act_5",
-      "id" : 68,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5127,7 +5891,7 @@
     },
     {
       "name" : "act_6",
-      "id" : 69,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5191,7 +5955,7 @@
     },
     {
       "name" : "act_7",
-      "id" : 70,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5217,7 +5981,7 @@
     },
     {
       "name" : "act_8",
-      "id" : 71,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5225,439 +5989,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
-      "id" : 72,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 73,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 187,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 74,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 153,
-            "column" : 36,
-            "source_fragment" : "2w1; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_12",
-      "id" : 75,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_13",
-      "id" : 76,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_14",
-      "id" : 77,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x02"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 154,
-            "column" : 38,
-            "source_fragment" : "2w2; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_15",
-      "id" : 78,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 152,
-            "column" : 37,
-            "source_fragment" : "2w0; ..."
-          }
-        },
-        {
-          "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/spgw.p4",
-            "line" : 196,
-            "column" : 12,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_16",
-      "id" : 79,
-      "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" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_17",
-      "id" : 80,
-      "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/spgw.p4",
-            "line" : 206,
-            "column" : 12,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_18",
-      "id" : 81,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "count",
-          "parameters" : [
-            {
-              "type" : "counter_array",
-              "value" : "FabricIngress.spgw_ingress.pdr_counter"
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 213,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 82,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 223,
-            "column" : 40,
-            "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/spgw.p4",
-            "line" : 224,
-            "column" : 34,
-            "source_fragment" : "= true; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 83,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len22"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ipv4", "total_len"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 232,
-            "column" : 34,
-            "source_fragment" : "= ipv4.total_len; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_21",
-      "id" : 84,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_3"]
             },
             {
               "type" : "expression",
@@ -5693,7 +6025,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_3"]
             }
           ],
           "source_info" : {
@@ -5706,8 +6038,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 85,
+      "name" : "act_9",
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5715,7 +6047,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_5"]
+              "value" : ["scalars", "tmp_4"]
             },
             {
               "type" : "expression",
@@ -5751,7 +6083,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_5"]
+              "value" : ["scalars", "tmp_4"]
             }
           ],
           "source_info" : {
@@ -5764,8 +6096,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 86,
+      "name" : "act_10",
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5790,8 +6122,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 87,
+      "name" : "act_11",
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5820,8 +6152,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 88,
+      "name" : "act_12",
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5850,8 +6182,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 89,
+      "name" : "act_13",
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5859,7 +6191,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type32"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
             },
             {
               "type" : "hexstr",
@@ -5868,7 +6200,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 160,
+            "line" : 164,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -5899,8 +6231,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 90,
+      "name" : "act_14",
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5935,8 +6267,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 91,
+      "name" : "act_15",
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5948,7 +6280,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -5961,8 +6293,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 92,
+      "name" : "act_16",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5974,7 +6306,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -5987,8 +6319,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 93,
+      "name" : "act_17",
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6046,8 +6378,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 94,
+      "name" : "act_18",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6076,8 +6408,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 95,
+      "name" : "act_19",
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6106,8 +6438,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 96,
+      "name" : "act_20",
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6119,11 +6451,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
             }
           ],
           "source_info" : {
@@ -6136,8 +6468,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 97,
+      "name" : "act_21",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6149,11 +6481,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
             }
           ],
           "source_info" : {
@@ -6166,8 +6498,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 98,
+      "name" : "act_22",
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6179,11 +6511,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
             }
           ],
           "source_info" : {
@@ -6196,8 +6528,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 99,
+      "name" : "act_23",
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6209,11 +6541,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result35"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
             }
           ],
           "source_info" : {
@@ -6227,635 +6559,43 @@
     },
     {
       "name" : "nop",
-      "id" : 100,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 101,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 102,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 103,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 104,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 105,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 106,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 251,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "version"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x04"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 252,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.version = 4"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "ihl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x05"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 135,
-            "column" : 28,
-            "source_fragment" : "5; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "dscp"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 254,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dscp = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "ecn"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 255,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.ecn = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "total_len"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv4", "total_len"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0024"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 256,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "identification"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x1513"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 258,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.identification = 0x1513"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "flags"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 259,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.flags = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "frag_offset"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 260,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.frag_offset = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 148,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "protocol"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x11"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 25,
-            "source_fragment" : "17; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "src_addr"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr24"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 263,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.tunnel_src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "dst_addr"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 264,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.tunnel_dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_ipv4", "hdr_checksum"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 265,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 267,
-            "column" : 8,
-            "source_fragment" : "gtpu_udp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_udp", "sport"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0868"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 268,
-            "column" : 8,
-            "source_fragment" : "gtpu_udp.sport = 2152"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_udp", "dport"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0868"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 269,
-            "column" : 8,
-            "source_fragment" : "gtpu_udp.dport = 2152"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_udp", "len"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len22"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0010"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 270,
-            "column" : 8,
-            "source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu_udp", "checksum"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 272,
-            "column" : 8,
-            "source_fragment" : "gtpu_udp.checksum = 0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 275,
-            "column" : 8,
-            "source_fragment" : "gtpu.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "version"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 276,
-            "column" : 8,
-            "source_fragment" : "gtpu.version = 0x01"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "pt"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 277,
-            "column" : 8,
-            "source_fragment" : "gtpu.pt = 0x01"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "spare"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 278,
-            "column" : 8,
-            "source_fragment" : "gtpu.spare = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "ex_flag"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 279,
-            "column" : 8,
-            "source_fragment" : "gtpu.ex_flag = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "seq_flag"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 280,
-            "column" : 8,
-            "source_fragment" : "gtpu.seq_flag = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "npdu_flag"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 281,
-            "column" : 8,
-            "source_fragment" : "gtpu.npdu_flag = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "msgtype"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0xff"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 282,
-            "column" : 8,
-            "source_fragment" : "gtpu.msgtype = 0xff"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "msglen"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 283,
-            "column" : 8,
-            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["gtpu", "teid"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid23"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 284,
-            "column" : 8,
-            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricEgress.bng_egress.downstream.encap_v4",
-      "id" : 107,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6872,7 +6612,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6958,7 +6698,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id34"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
             }
           ],
           "source_info" : {
@@ -6977,7 +6717,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -7043,7 +6783,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 134,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -7052,7 +6792,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v6",
-      "id" : 108,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7069,7 +6809,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -7155,7 +6895,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id34"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
             }
           ],
           "source_info" : {
@@ -7174,7 +6914,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id33"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
             }
           ],
           "source_info" : {
@@ -7240,7 +6980,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 127,
+            "line" : 135,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -7249,7 +6989,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 109,
+      "id" : 94,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -7317,7 +7057,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 163,
+            "line" : 165,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -7735,7 +7475,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 159,
+            "line" : 161,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -7744,7 +7484,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 110,
+      "id" : 95,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -7757,7 +7497,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit45"]
             },
             {
               "type" : "expression",
@@ -7786,7 +7526,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             },
             {
               "type" : "runtime_data",
@@ -7804,13 +7544,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 111,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 112,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7884,7 +7624,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -7898,7 +7638,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7926,7 +7666,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -7940,7 +7680,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7967,7 +7707,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 113,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8009,7 +7749,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -8023,7 +7763,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8051,7 +7791,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -8065,7 +7805,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8092,7 +7832,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 114,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8200,7 +7940,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -8214,7 +7954,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8242,7 +7982,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -8256,7 +7996,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8283,7 +8023,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 115,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8370,7 +8110,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -8384,7 +8124,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8412,7 +8152,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -8426,7 +8166,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8453,7 +8193,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 116,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8606,7 +8346,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -8620,7 +8360,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8648,7 +8388,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -8662,7 +8402,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8689,7 +8429,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 117,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8810,7 +8550,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -8824,7 +8564,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8852,7 +8592,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -8866,7 +8606,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8893,7 +8633,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 118,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9080,7 +8820,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -9094,7 +8834,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9122,7 +8862,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -9136,7 +8876,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9163,7 +8903,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 119,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9190,7 +8930,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -9205,7 +8945,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -9219,7 +8959,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9247,7 +8987,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -9261,7 +9001,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9288,7 +9028,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 120,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9381,7 +9121,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -9396,7 +9136,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -9410,7 +9150,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9438,7 +9178,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -9452,7 +9192,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9479,7 +9219,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 121,
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9540,7 +9280,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -9555,7 +9295,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -9569,7 +9309,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9597,7 +9337,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -9611,7 +9351,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9638,7 +9378,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 122,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9765,7 +9505,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -9780,7 +9520,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -9794,7 +9534,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9822,7 +9562,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -9836,7 +9576,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9863,7 +9603,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 123,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9969,7 +9709,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -9984,7 +9724,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -9998,7 +9738,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10026,7 +9766,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -10040,7 +9780,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10067,7 +9807,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 124,
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10239,7 +9979,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -10254,7 +9994,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -10268,7 +10008,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10296,7 +10036,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -10310,7 +10050,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10337,7 +10077,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 125,
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10477,7 +10217,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -10492,7 +10232,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -10506,7 +10246,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10534,7 +10274,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -10548,7 +10288,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10575,7 +10315,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 126,
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10781,7 +10521,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id41"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
             }
           ],
           "source_info" : {
@@ -10796,7 +10536,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -10810,7 +10550,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10838,7 +10578,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -10852,7 +10592,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10879,13 +10619,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 127,
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 128,
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10927,7 +10667,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -10941,7 +10681,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10969,7 +10709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -10983,7 +10723,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11010,7 +10750,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 129,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11071,7 +10811,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -11085,7 +10825,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11113,7 +10853,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -11127,7 +10867,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11154,7 +10894,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 130,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11249,7 +10989,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -11263,7 +11003,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11291,7 +11031,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -11305,7 +11045,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11332,7 +11072,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 131,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11397,7 +11137,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -11411,7 +11151,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11439,7 +11179,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -11453,7 +11193,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11480,7 +11220,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 132,
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11579,7 +11319,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -11593,7 +11333,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11621,7 +11361,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -11635,7 +11375,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11662,7 +11402,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 133,
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11780,7 +11520,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -11794,7 +11534,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11822,7 +11562,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -11836,7 +11576,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11863,7 +11603,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 134,
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12015,7 +11755,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -12029,7 +11769,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12057,7 +11797,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -12071,7 +11811,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12098,7 +11838,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 135,
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12140,7 +11880,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -12154,7 +11894,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12182,7 +11922,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -12196,7 +11936,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12223,7 +11963,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 136,
+      "id" : 121,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12299,7 +12039,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -12313,7 +12053,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12341,7 +12081,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -12355,7 +12095,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12382,7 +12122,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 137,
+      "id" : 122,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12477,7 +12217,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -12491,7 +12231,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12519,7 +12259,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -12533,7 +12273,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12560,7 +12300,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 138,
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12689,7 +12429,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -12703,7 +12443,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12731,7 +12471,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -12745,7 +12485,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12772,7 +12512,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 139,
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12871,7 +12611,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -12885,7 +12625,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12913,7 +12653,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -12927,7 +12667,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12954,7 +12694,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 140,
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13087,7 +12827,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -13101,7 +12841,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13129,7 +12869,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -13143,7 +12883,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13170,7 +12910,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 141,
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13322,7 +13062,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -13336,7 +13076,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13364,7 +13104,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -13378,7 +13118,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13405,7 +13145,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 142,
+      "id" : 127,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13591,7 +13331,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
             },
             {
               "type" : "expression",
@@ -13605,7 +13345,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13633,7 +13373,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
             },
             {
               "type" : "expression",
@@ -13647,7 +13387,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13674,7 +13414,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 143,
+      "id" : 128,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -13765,7 +13505,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 128,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -13993,7 +13733,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 140,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -14179,7 +13919,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 169,
+            "line" : 171,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -14274,7 +14014,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 173,
+            "line" : 175,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -14321,7 +14061,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 144,
+      "id" : 129,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14366,7 +14106,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 145,
+      "id" : 130,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14697,7 +14437,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 146,
+      "id" : 131,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14738,7 +14478,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 147,
+      "id" : 132,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14846,7 +14586,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 118,
+            "line" : 126,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -14855,7 +14595,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 148,
+      "id" : 133,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14925,7 +14665,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14953,7 +14693,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 149,
+      "id" : 134,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15023,7 +14763,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -15051,7 +14791,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_inner_vlan",
-      "id" : 150,
+      "id" : 135,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15140,7 +14880,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -15159,7 +14899,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 125,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -15168,7 +14908,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 151,
+      "id" : 136,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15189,8 +14929,600 @@
       ]
     },
     {
-      "name" : "act_37",
-      "id" : 152,
+      "name" : "FabricEgress.spgw_egress.gtpu_encap",
+      "id" : 137,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 308,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "version"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x04"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 309,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.version = 4"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "ihl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x05"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 143,
+            "column" : 28,
+            "source_fragment" : "5; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "dscp"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 311,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "ecn"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 312,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "total_len"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "total_len"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0024"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 313,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "identification"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x1513"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 315,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "flags"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 316,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "frag_offset"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 317,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x40"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 156,
+            "column" : 32,
+            "source_fragment" : "64; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "protocol"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x11"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 140,
+            "column" : 25,
+            "source_fragment" : "17; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "src_addr"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr27"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 320,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "dst_addr"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr28"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 321,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "hdr_checksum"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 322,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 324,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "sport"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port26"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 325,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "dport"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0868"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 326,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.dport = 2152"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "len"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0010"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 327,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "checksum"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 329,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.checksum = 0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "outer_gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 332,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "version"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 333,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.version = 0x01"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "pt"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 334,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "spare"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 335,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.spare = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "ex_flag"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 336,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "seq_flag"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 337,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "npdu_flag"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 338,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "msgtype"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0xff"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 339,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "msglen"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 340,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "teid"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 341,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_24",
+      "id" : 138,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15206,8 +15538,8 @@
       ]
     },
     {
-      "name" : "act_38",
-      "id" : 153,
+      "name" : "act_25",
+      "id" : 139,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15257,8 +15589,8 @@
       ]
     },
     {
-      "name" : "act_39",
-      "id" : 154,
+      "name" : "act_26",
+      "id" : 140,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15279,8 +15611,8 @@
       ]
     },
     {
-      "name" : "act_40",
-      "id" : 155,
+      "name" : "act_27",
+      "id" : 141,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15309,8 +15641,8 @@
       ]
     },
     {
-      "name" : "act_41",
-      "id" : 156,
+      "name" : "act_28",
+      "id" : 142,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15339,8 +15671,8 @@
       ]
     },
     {
-      "name" : "act_42",
-      "id" : 157,
+      "name" : "act_29",
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15361,8 +15693,8 @@
       ]
     },
     {
-      "name" : "act_43",
-      "id" : 158,
+      "name" : "act_30",
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15383,8 +15715,8 @@
       ]
     },
     {
-      "name" : "act_44",
-      "id" : 159,
+      "name" : "act_31",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15432,8 +15764,8 @@
       ]
     },
     {
-      "name" : "act_45",
-      "id" : 160,
+      "name" : "act_32",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15454,8 +15786,8 @@
       ]
     },
     {
-      "name" : "act_46",
-      "id" : 161,
+      "name" : "act_33",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15503,8 +15835,8 @@
       ]
     },
     {
-      "name" : "act_47",
-      "id" : 162,
+      "name" : "act_34",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15525,8 +15857,8 @@
       ]
     },
     {
-      "name" : "act_48",
-      "id" : 163,
+      "name" : "act_35",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15574,8 +15906,74 @@
       ]
     },
     {
-      "name" : "act_49",
-      "id" : 164,
+      "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" : 345,
+            "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,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15587,21 +15985,21 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 288,
+            "filename" : "include/control/spgw.p4",
+            "line" : 346,
             "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
       ]
     },
     {
-      "name" : "act_50",
-      "id" : 165,
+      "name" : "act_39",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15630,8 +16028,8 @@
       ]
     },
     {
-      "name" : "act_51",
-      "id" : 166,
+      "name" : "act_40",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15666,8 +16064,8 @@
       ]
     },
     {
-      "name" : "act_52",
-      "id" : 167,
+      "name" : "act_41",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15693,7 +16091,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       }
                     }
                   },
@@ -15715,8 +16113,8 @@
       ]
     },
     {
-      "name" : "act_53",
-      "id" : 168,
+      "name" : "act_42",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15764,8 +16162,8 @@
       ]
     },
     {
-      "name" : "act_54",
-      "id" : 169,
+      "name" : "act_43",
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15791,7 +16189,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes43"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
                       }
                     }
                   },
@@ -15813,8 +16211,8 @@
       ]
     },
     {
-      "name" : "act_55",
-      "id" : 170,
+      "name" : "act_44",
+      "id" : 158,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15840,7 +16238,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words42"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
                       }
                     }
                   },
@@ -15872,157 +16270,12 @@
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
-      "init_table" : "tbl_act",
+      "init_table" : "node_2",
       "tables" : [
         {
           "name" : "tbl_act",
           "id" : 0,
           "source_info" : {
-            "filename" : "fabric.p4",
-            "line" : 62,
-            "column" : 50,
-            "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_0"],
-          "base_default_next" : "node_3",
-          "next_tables" : {
-            "act_0" : "node_3"
-          },
-          "default_entry" : {
-            "action_id" : 63,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_0",
-          "id" : 1,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 34,
-            "column" : 32,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act"],
-          "base_default_next" : "node_5",
-          "next_tables" : {
-            "act" : "node_5"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 2,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 35,
-            "column" : 18,
-            "source_fragment" : "= ipv4; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_3"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_3" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 66,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_2",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 39,
-            "column" : 16,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_10",
-          "next_tables" : {
-            "act_1" : "node_10"
-          },
-          "default_entry" : {
-            "action_id" : 64,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_3",
-          "id" : 4,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 41,
-            "column" : 12,
-            "source_fragment" : "udp.setInvalid()"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_10",
-          "next_tables" : {
-            "act_2" : "node_10"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_4",
-          "id" : 5,
-          "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 25,
             "column" : 42,
@@ -16035,14 +16288,450 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_4"],
-          "base_default_next" : "node_12",
+          "action_ids" : [61],
+          "actions" : ["act"],
+          "base_default_next" : "tbl_act_0",
           "next_tables" : {
-            "act_4" : "node_12"
+            "act" : "tbl_act_0"
           },
           "default_entry" : {
-            "action_id" : 67,
+            "action_id" : 61,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_0",
+          "id" : 1,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [62],
+          "actions" : ["act_0"],
+          "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
+          "next_tables" : {
+            "act_0" : "FabricIngress.spgw_ingress.interface_lookup"
+          },
+          "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,
+            "column" : 10,
+            "source_fragment" : "interface_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "lpm",
+              "name" : "ipv4_dst_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "gtpu_is_valid",
+              "target" : ["gtpu", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "lpm",
+          "type" : "simple",
+          "max_size" : 128,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [52],
+          "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
+          "base_default_next" : "node_6",
+          "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" : 251,
+            "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"
+          },
+          "default_entry" : {
+            "action_id" : 63,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "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",
+              "name" : "ue_addr",
+              "target" : ["inner_ipv4", "src_addr"],
+              "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" : 265,
+            "column" : 8,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [64],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "act_2" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 64,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 221,
+            "column" : 10,
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [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",
+          "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"
+          },
+          "default_entry" : {
+            "action_id" : 60,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 235,
+                "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" : 57,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 236,
+                "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" : 58,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 237,
+                "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" : 59,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.far_lookup",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 165,
+            "column" : 10,
+            "source_fragment" : "far_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "far_id",
+              "target" : ["scalars", "fabric_metadata_t._spgw_far_id30"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 2048,
+          "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",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_16",
+            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_16"
+          },
+          "default_entry" : {
+            "action_id" : 55,
+            "action_const" : true,
+            "action_data" : ["0x1", "0x1"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_3",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 282,
+            "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" : 291,
+            "column" : 32,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [66],
+          "actions" : ["act_4"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "act_4" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 66,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16050,7 +16739,7 @@
         },
         {
           "name" : "tbl_act_5",
-          "id" : 6,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 111,
@@ -16064,14 +16753,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
+          "action_ids" : [67],
           "actions" : ["act_5"],
-          "base_default_next" : "node_14",
+          "base_default_next" : "node_21",
           "next_tables" : {
-            "act_5" : "node_14"
+            "act_5" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 67,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16079,7 +16768,7 @@
         },
         {
           "name" : "tbl_act_6",
-          "id" : 7,
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 117,
@@ -16093,14 +16782,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [69],
+          "action_ids" : [68],
           "actions" : ["act_6"],
-          "base_default_next" : "node_16",
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_16"
+            "act_6" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 69,
+            "action_id" : 68,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16108,7 +16797,7 @@
         },
         {
           "name" : "tbl_act_7",
-          "id" : 8,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 127,
@@ -16122,14 +16811,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70],
+          "action_ids" : [69],
           "actions" : ["act_7"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
             "act_7" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 70,
+            "action_id" : 69,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16137,7 +16826,7 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 9,
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 53,
@@ -16176,7 +16865,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37, 38, 39],
+          "action_ids" : [27, 28, 29],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -16185,7 +16874,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 27,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16193,7 +16882,7 @@
         },
         {
           "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 10,
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 92,
@@ -16232,673 +16921,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [30],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "tbl_act_8",
+          "base_default_next" : "node_27",
           "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "tbl_act_8"
+            "FabricIngress.filtering.set_forwarding_type" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 30,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_8",
-          "id" : 11,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [79],
-          "actions" : ["act_16"],
-          "base_default_next" : "node_21",
-          "next_tables" : {
-            "act_16" : "node_21"
-          },
-          "default_entry" : {
-            "action_id" : 79,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.uplink_filter_table",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 84,
-            "column" : 10,
-            "source_fragment" : "uplink_filter_table"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "gtp_ipv4_dst",
-              "target" : ["gtpu_ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [1],
-          "actions" : ["nop"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
-          },
-          "default_entry" : {
-            "action_id" : 1,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 13,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_25",
-          "next_tables" : {
-            "act_8" : "node_25"
-          },
-          "default_entry" : {
-            "action_id" : 71,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 14,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_25",
-          "next_tables" : {
-            "act_9" : "node_25"
-          },
-          "default_entry" : {
-            "action_id" : 72,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 15,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 187,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_10"],
-          "base_default_next" : "tbl_act_12",
-          "next_tables" : {
-            "act_10" : "tbl_act_12"
-          },
-          "default_entry" : {
-            "action_id" : 73,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_12",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 189,
-            "column" : 39,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_11"],
-          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
-          "next_tables" : {
-            "act_11" : "tbl_spgw_ingress_gtpu_decap"
-          },
-          "default_entry" : {
-            "action_id" : 74,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_ingress_gtpu_decap",
-          "id" : 17,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 190,
-            "column" : 12,
-            "source_fragment" : "gtpu_decap()"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [17],
-          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.gtpu_decap" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 17,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_filter_table",
-          "id" : 18,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 73,
-            "column" : 10,
-            "source_fragment" : "downlink_filter_table"
-          },
-          "key" : [
-            {
-              "match_type" : "lpm",
-              "name" : "ipv4_prefix",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "lpm",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [0],
-          "actions" : ["nop"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_13",
-            "__MISS__" : "tbl_act_14"
-          },
-          "default_entry" : {
-            "action_id" : 0,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
-          "id" : 19,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_32",
-          "next_tables" : {
-            "act_12" : "node_32"
-          },
-          "default_entry" : {
-            "action_id" : 75,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_14",
-          "id" : 20,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_32",
-          "next_tables" : {
-            "act_13" : "node_32"
-          },
-          "default_entry" : {
-            "action_id" : 76,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_15",
-          "id" : 21,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 192,
-            "column" : 39,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [77],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "act_14" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 77,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_16",
-          "id" : 22,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 194,
-            "column" : 39,
-            "source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [78],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "act_15" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 78,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "id" : 23,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 111,
-            "column" : 10,
-            "source_fragment" : "uplink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "teid",
-              "target" : ["scalars", "fabric_metadata_t._spgw_teid23"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["ipv4", "src_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [19, 16],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
-          "base_default_next" : "node_41",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_41",
-            "NoAction" : "node_41"
-          },
-          "default_entry" : {
-            "action_id" : 16,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "id" : 24,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 103,
-            "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" : [18, 15],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
-          "base_default_next" : "node_41",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_41",
-            "NoAction" : "node_41"
-          },
-          "default_entry" : {
-            "action_id" : 15,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_17",
-          "id" : 25,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 206,
-            "column" : 12,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [80],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_41",
-          "next_tables" : {
-            "act_17" : "node_41"
-          },
-          "default_entry" : {
-            "action_id" : 80,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
-          "id" : 26,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 123,
-            "column" : 10,
-            "source_fragment" : "flexible_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "ternary",
-              "name" : "spgw_direction",
-              "target" : ["scalars", "fabric_metadata_t._spgw_direction21"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr25"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "teid",
-              "target" : ["scalars", "fabric_metadata_t._spgw_teid23"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "ipv4_src",
-              "target" : ["ipv4", "src_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "ip_proto",
-              "target" : ["ipv4", "protocol"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport17"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport18"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [20],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_18",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_18"
-          },
-          "default_entry" : {
-            "action_id" : 20,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_18",
-          "id" : 27,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 213,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["act_18"],
-          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
-          "next_tables" : {
-            "act_18" : "FabricIngress.spgw_ingress.far_lookup"
-          },
-          "default_entry" : {
-            "action_id" : 81,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.far_lookup",
-          "id" : 28,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 168,
-            "column" : 10,
-            "source_fragment" : "far_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id27"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [21, 22],
-          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
-          "base_default_next" : "node_46",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_46",
-            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_46"
-          },
-          "default_entry" : {
-            "action_id" : 21,
-            "action_const" : true,
-            "action_data" : ["0x1", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_19",
-          "id" : 29,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 223,
-            "column" : 40,
-            "source_fragment" : "= true; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["act_19"],
-          "base_default_next" : "tbl_act_20",
-          "next_tables" : {
-            "act_19" : "tbl_act_20"
-          },
-          "default_entry" : {
-            "action_id" : 82,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 30,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 232,
-            "column" : 34,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_49",
-          "next_tables" : {
-            "act_20" : "node_49"
-          },
-          "default_entry" : {
-            "action_id" : 83,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 31,
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -16925,7 +16963,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41, 6],
+          "action_ids" : [31, 4],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -16933,7 +16971,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 6,
+            "action_id" : 4,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16941,7 +16979,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 32,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -16962,7 +17000,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42, 7],
+          "action_ids" : [32, 5],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -16970,7 +17008,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 7,
+            "action_id" : 5,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16978,7 +17016,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 33,
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 108,
@@ -16999,7 +17037,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43, 44, 8],
+          "action_ids" : [33, 34, 6],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17008,7 +17046,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 8,
+            "action_id" : 6,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -17016,7 +17054,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v6",
-          "id" : 34,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 135,
@@ -17037,7 +17075,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45, 9],
+          "action_ids" : [35, 7],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17045,7 +17083,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 7,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17053,7 +17091,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 35,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 60,
@@ -17140,18 +17178,18 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46, 47, 48, 49, 50],
+          "action_ids" : [36, 37, 38, 39, 40],
           "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_59",
+          "base_default_next" : "node_37",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_59",
-            "FabricIngress.acl.punt_to_cpu" : "node_59",
-            "FabricIngress.acl.set_clone_session_id" : "node_59",
-            "FabricIngress.acl.drop" : "node_59",
-            "FabricIngress.acl.nop_acl" : "node_59"
+            "FabricIngress.acl.set_next_id_acl" : "node_37",
+            "FabricIngress.acl.punt_to_cpu" : "node_37",
+            "FabricIngress.acl.set_clone_session_id" : "node_37",
+            "FabricIngress.acl.drop" : "node_37",
+            "FabricIngress.acl.nop_acl" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 40,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17159,7 +17197,7 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 36,
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 119,
@@ -17186,7 +17224,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53, 54, 11],
+          "action_ids" : [43, 44, 9],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -17195,7 +17233,7 @@
             "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 11,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17203,7 +17241,7 @@
         },
         {
           "name" : "FabricIngress.next.simple",
-          "id" : 37,
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 158,
@@ -17224,7 +17262,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55, 56, 57, 12],
+          "action_ids" : [45, 46, 47, 10],
           "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -17234,7 +17272,7 @@
             "nop" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 12,
+            "action_id" : 10,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17242,7 +17280,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 38,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 202,
@@ -17264,7 +17302,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58, 59, 60, 13],
+          "action_ids" : [48, 49, 50, 11],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -17276,7 +17314,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 39,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 236,
@@ -17297,7 +17335,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61, 14],
+          "action_ids" : [51, 12],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -17305,7 +17343,7 @@
             "nop" : "FabricIngress.next.next_vlan"
           },
           "default_entry" : {
-            "action_id" : 14,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17313,7 +17351,7 @@
         },
         {
           "name" : "FabricIngress.next.next_vlan",
-          "id" : 40,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 86,
@@ -17334,24 +17372,24 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51, 52, 10],
+          "action_ids" : [41, 42, 8],
           "actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
-          "base_default_next" : "node_65",
+          "base_default_next" : "node_43",
           "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_65",
-            "FabricIngress.next.set_double_vlan" : "node_65",
-            "nop" : "node_65"
+            "FabricIngress.next.set_vlan" : "node_43",
+            "FabricIngress.next.set_double_vlan" : "node_43",
+            "nop" : "node_43"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 8,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 41,
+          "name" : "tbl_act_8",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -17365,22 +17403,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_67",
+          "action_ids" : [70],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_45",
           "next_tables" : {
-            "act_21" : "node_67"
+            "act_8" : "node_45"
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 70,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 42,
+          "name" : "tbl_act_9",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -17394,14 +17432,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["act_22"],
+          "action_ids" : [71],
+          "actions" : ["act_9"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_22" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_9" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 71,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17409,7 +17447,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 43,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -17430,7 +17468,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 2],
+          "action_ids" : [13, 0],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
@@ -17438,7 +17476,7 @@
             "nop" : "FabricIngress.process_set_source_sink.tb_set_sink"
           },
           "default_entry" : {
-            "action_id" : 2,
+            "action_id" : 0,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17446,7 +17484,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 44,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 67,
@@ -17467,23 +17505,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [24, 3],
+          "action_ids" : [14, 1],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
-          "base_default_next" : "node_71",
+          "base_default_next" : "node_49",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_71",
-            "nop" : "node_71"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_49",
+            "nop" : "node_49"
           },
           "default_entry" : {
-            "action_id" : 3,
+            "action_id" : 1,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_23",
-          "id" : 45,
+          "name" : "tbl_act_10",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 89,
@@ -17497,14 +17535,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86],
-          "actions" : ["act_23"],
+          "action_ids" : [72],
+          "actions" : ["act_10"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
-            "act_23" : "FabricIngress.bng_ingress.t_line_map"
+            "act_10" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 72,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17512,7 +17550,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.t_line_map",
-          "id" : 46,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 323,
@@ -17523,13 +17561,13 @@
             {
               "match_type" : "exact",
               "name" : "s_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_s_tag36"],
+              "target" : ["scalars", "fabric_metadata_t._bng_s_tag42"],
               "mask" : null
             },
             {
               "match_type" : "exact",
               "name" : "c_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_c_tag37"],
+              "target" : ["scalars", "fabric_metadata_t._bng_c_tag43"],
               "mask" : null
             }
           ],
@@ -17539,22 +17577,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36],
+          "action_ids" : [26],
           "actions" : ["FabricIngress.bng_ingress.set_line"],
-          "base_default_next" : "node_74",
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "FabricIngress.bng_ingress.set_line" : "node_74"
+            "FabricIngress.bng_ingress.set_line" : "node_52"
           },
           "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 26,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 47,
+          "name" : "tbl_act_11",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 342,
@@ -17568,14 +17606,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89],
-          "actions" : ["act_26"],
+          "action_ids" : [75],
+          "actions" : ["act_13"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
           "next_tables" : {
-            "act_26" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+            "act_13" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 75,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17583,7 +17621,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
-          "id" : 48,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 51,
@@ -17610,23 +17648,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 4],
+          "action_ids" : [15, 2],
           "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_25",
-            "__MISS__" : "tbl_act_26"
+            "__HIT__" : "tbl_act_12",
+            "__MISS__" : "tbl_act_13"
           },
           "default_entry" : {
-            "action_id" : 4,
+            "action_id" : 2,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 49,
+          "name" : "tbl_act_12",
+          "id" : 34,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17634,22 +17672,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_79",
+          "action_ids" : [73],
+          "actions" : ["act_11"],
+          "base_default_next" : "node_57",
           "next_tables" : {
-            "act_24" : "node_79"
+            "act_11" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 73,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 50,
+          "name" : "tbl_act_13",
+          "id" : 35,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17657,22 +17695,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_79",
+          "action_ids" : [74],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_57",
           "next_tables" : {
-            "act_25" : "node_79"
+            "act_12" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
-          "id" : 51,
+          "name" : "tbl_act_14",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 126,
@@ -17686,14 +17724,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_81",
+          "action_ids" : [76],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "act_27" : "node_81"
+            "act_14" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 76,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17701,7 +17739,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "id" : 52,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 87,
@@ -17712,7 +17750,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
               "mask" : null
             },
             {
@@ -17734,23 +17772,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [28, 26],
+          "action_ids" : [18, 16],
           "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_28",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_15",
             "FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
           },
           "default_entry" : {
-            "action_id" : 26,
+            "action_id" : 16,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
-          "id" : 53,
+          "name" : "tbl_act_15",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 131,
@@ -17764,22 +17802,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
-          "actions" : ["act_28"],
+          "action_ids" : [77],
+          "actions" : ["act_15"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_28" : null
+            "act_15" : null
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 77,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_29",
-          "id" : 54,
+          "name" : "tbl_act_16",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 112,
@@ -17793,14 +17831,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["act_30"],
+          "action_ids" : [79],
+          "actions" : ["act_17"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
           "next_tables" : {
-            "act_30" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+            "act_17" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 79,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17808,7 +17846,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
-          "id" : 55,
+          "id" : 40,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 109,
@@ -17819,7 +17857,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
               "mask" : null
             },
             {
@@ -17841,23 +17879,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [29, 27],
+          "action_ids" : [19, 17],
           "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_30",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_17",
             "FabricIngress.bng_ingress.upstream.term_enabled_v6" : null
           },
           "default_entry" : {
-            "action_id" : 27,
+            "action_id" : 17,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 56,
+          "name" : "tbl_act_17",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 139,
@@ -17871,14 +17909,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
-          "actions" : ["act_29"],
+          "action_ids" : [78],
+          "actions" : ["act_16"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_29" : null
+            "act_16" : null
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17886,7 +17924,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
-          "id" : 57,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 169,
@@ -17897,7 +17935,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
               "mask" : null
             }
           ],
@@ -17907,23 +17945,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [5, 30, 31],
+          "action_ids" : [3, 20, 21],
           "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_31",
-            "__MISS__" : "tbl_act_32"
+            "__HIT__" : "tbl_act_18",
+            "__MISS__" : "tbl_act_19"
           },
           "default_entry" : {
-            "action_id" : 5,
+            "action_id" : 3,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 58,
+          "name" : "tbl_act_18",
+          "id" : 43,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17931,22 +17969,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_92",
+          "action_ids" : [80],
+          "actions" : ["act_18"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "act_31" : "node_92"
+            "act_18" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 80,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 59,
+          "name" : "tbl_act_19",
+          "id" : 44,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17954,14 +17992,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
-          "actions" : ["act_32"],
-          "base_default_next" : "node_92",
+          "action_ids" : [81],
+          "actions" : ["act_19"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "act_32" : "node_92"
+            "act_19" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 81,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17969,7 +18007,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "id" : 60,
+          "id" : 45,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 194,
@@ -17980,7 +18018,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
               "mask" : null
             },
             {
@@ -18008,23 +18046,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 34],
+          "action_ids" : [22, 24],
           "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_33",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_34"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_20",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_21"
           },
           "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 24,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 61,
+          "name" : "tbl_act_20",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 238,
@@ -18038,22 +18076,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96],
-          "actions" : ["act_33"],
+          "action_ids" : [82],
+          "actions" : ["act_20"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_33" : null
+            "act_20" : null
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_34",
-          "id" : 62,
+          "name" : "tbl_act_21",
+          "id" : 47,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 241,
@@ -18067,14 +18105,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
-          "actions" : ["act_34"],
+          "action_ids" : [83],
+          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_34" : null
+            "act_21" : null
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 83,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18082,7 +18120,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
-          "id" : 63,
+          "id" : 48,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 210,
@@ -18093,7 +18131,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id33"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
               "mask" : null
             },
             {
@@ -18115,23 +18153,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33, 35],
+          "action_ids" : [23, 25],
           "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_35",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_36"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_22",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_23"
           },
           "default_entry" : {
-            "action_id" : 35,
+            "action_id" : 25,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_35",
-          "id" : 64,
+          "name" : "tbl_act_22",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 250,
@@ -18145,22 +18183,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [98],
-          "actions" : ["act_35"],
+          "action_ids" : [84],
+          "actions" : ["act_22"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_35" : null
+            "act_22" : null
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_36",
-          "id" : 65,
+          "name" : "tbl_act_23",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 253,
@@ -18174,14 +18212,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [99],
-          "actions" : ["act_36"],
+          "action_ids" : [85],
+          "actions" : ["act_23"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_36" : null
+            "act_23" : null
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18228,86 +18266,9 @@
       ],
       "conditionals" : [
         {
-          "name" : "node_3",
+          "name" : "node_2",
           "id" : 0,
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 34,
-            "column" : 12,
-            "source_fragment" : "! is_gtpu_encapped"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["gtpu", "$valid$"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_0",
-          "false_next" : "node_5"
-        },
-        {
-          "name" : "node_5",
-          "id" : 1,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_normalizer_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_10"
-        },
-        {
-          "name" : "node_7",
-          "id" : 2,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 38,
-            "column" : 12,
-            "source_fragment" : "inner_udp.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["inner_udp", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_2",
-          "false_next" : "tbl_act_3"
-        },
-        {
-          "name" : "node_10",
-          "id" : 3,
-          "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 24,
             "column" : 12,
@@ -18324,13 +18285,159 @@
               }
             }
           },
-          "true_next" : "tbl_act_4",
-          "false_next" : "node_12"
+          "true_next" : "tbl_act",
+          "false_next" : "tbl_act_0"
         },
         {
-          "name" : "node_12",
+          "name" : "node_6",
+          "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 251,
+            "column" : 12,
+            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw32"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : true
+              }
+            }
+          },
+          "true_next" : "tbl_act_1",
+          "false_next" : "node_8"
+        },
+        {
+          "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",
+          "id" : 3,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 255,
+            "column" : 12,
+            "source_fragment" : "hdr.gtpu.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["gtpu", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "false_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+        },
+        {
+          "name" : "node_13",
           "id" : 4,
           "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 268,
+            "column" : 12,
+            "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : true
+              }
+            }
+          },
+          "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" : 279,
+            "column" : 12,
+            "source_fragment" : "fabric_md.spgw.far_dropped == true"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : true
+              }
+            }
+          },
+          "true_next" : "tbl_act_3",
+          "false_next" : "tbl_act_4"
+        },
+        {
+          "name" : "node_19",
+          "id" : 6,
+          "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 110,
             "column" : 12,
@@ -18348,11 +18455,11 @@
             }
           },
           "true_next" : "tbl_act_5",
-          "false_next" : "node_14"
+          "false_next" : "node_21"
         },
         {
-          "name" : "node_14",
-          "id" : 5,
+          "name" : "node_21",
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 116,
@@ -18371,11 +18478,11 @@
             }
           },
           "true_next" : "tbl_act_6",
-          "false_next" : "node_16"
+          "false_next" : "node_23"
         },
         {
-          "name" : "node_16",
-          "id" : 6,
+          "name" : "node_23",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 122,
@@ -18404,247 +18511,11 @@
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
-          "name" : "node_21",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 181,
-            "column" : 12,
-            "source_fragment" : "gtpu.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["gtpu", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "FabricIngress.spgw_ingress.uplink_filter_table",
-          "false_next" : "FabricIngress.spgw_ingress.downlink_filter_table"
-        },
-        {
-          "name" : "node_25",
-          "id" : 8,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 185,
-            "column" : 16,
-            "source_fragment" : "!uplink_filter_table.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_tmp"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_11",
-          "false_next" : "tbl_act_12"
-        },
-        {
-          "name" : "node_32",
+          "name" : "node_27",
           "id" : 9,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "spgw_ingress_tmp_0"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_15",
-          "false_next" : "tbl_act_16"
-        },
-        {
-          "name" : "node_35",
-          "id" : 10,
-          "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_36",
-          "false_next" : "node_41"
-        },
-        {
-          "name" : "node_36",
-          "id" : 11,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 201,
-            "column" : 12,
-            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_UPLINK"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
-              },
-              "right" : {
-                "type" : "hexstr",
-                "value" : "0x01"
-              }
-            }
-          },
-          "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "false_next" : "node_38"
-        },
-        {
-          "name" : "node_38",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 203,
-            "column" : 19,
-            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_direction21"]
-              },
-              "right" : {
-                "type" : "hexstr",
-                "value" : "0x02"
-              }
-            }
-          },
-          "true_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "false_next" : "tbl_act_17"
-        },
-        {
-          "name" : "node_41",
-          "id" : 13,
-          "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_42",
-          "false_next" : "node_49"
-        },
-        {
-          "name" : "node_42",
-          "id" : 14,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 209,
-            "column" : 12,
-            "source_fragment" : "fabric_meta.spgw.pdr_hit == false"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit28"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : false
-              }
-            }
-          },
-          "true_next" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
-          "false_next" : "tbl_act_18"
-        },
-        {
-          "name" : "node_46",
-          "id" : 15,
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 220,
-            "column" : 12,
-            "source_fragment" : "fabric_meta.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_dropped29"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_19",
-          "false_next" : "tbl_act_20"
-        },
-        {
-          "name" : "node_49",
-          "id" : 16,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 69,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -18669,12 +18540,12 @@
               }
             }
           },
-          "true_next" : "node_50",
+          "true_next" : "node_28",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_50",
-          "id" : 17,
+          "name" : "node_28",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 150,
@@ -18696,11 +18567,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_52"
+          "false_next" : "node_30"
         },
         {
-          "name" : "node_52",
-          "id" : 18,
+          "name" : "node_30",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 151,
@@ -18722,11 +18593,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_54"
+          "false_next" : "node_32"
         },
         {
-          "name" : "node_54",
-          "id" : 19,
+          "name" : "node_32",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 152,
@@ -18748,11 +18619,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "node_56"
+          "false_next" : "node_34"
         },
         {
-          "name" : "node_56",
-          "id" : 20,
+          "name" : "node_34",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 154,
@@ -18777,11 +18648,11 @@
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_59",
-          "id" : 21,
+          "name" : "node_37",
+          "id" : 14,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 75,
+            "line" : 73,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -18810,8 +18681,8 @@
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
-          "name" : "node_65",
-          "id" : 22,
+          "name" : "node_43",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -18832,12 +18703,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_21",
-          "false_next" : "node_67"
+          "true_next" : "tbl_act_8",
+          "false_next" : "node_45"
         },
         {
-          "name" : "node_67",
-          "id" : 23,
+          "name" : "node_45",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -18858,12 +18729,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_22",
+          "true_next" : "tbl_act_9",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_71",
-          "id" : 24,
+          "name" : "node_49",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 86,
@@ -18881,7 +18752,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink40"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
                   }
                 }
               },
@@ -18891,12 +18762,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_23",
+          "true_next" : "tbl_act_10",
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
-          "name" : "node_74",
-          "id" : 25,
+          "name" : "node_52",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 341,
@@ -18914,12 +18785,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
+          "true_next" : "tbl_act_11",
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
-          "name" : "node_79",
-          "id" : 26,
+          "name" : "node_57",
+          "id" : 19,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -18931,12 +18802,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_81"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_59"
         },
         {
-          "name" : "node_81",
-          "id" : 27,
+          "name" : "node_59",
+          "id" : 20,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -18956,11 +18827,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_82"
+          "true_next" : "node_60"
         },
         {
-          "name" : "node_82",
-          "id" : 28,
+          "name" : "node_60",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 128,
@@ -18979,11 +18850,11 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "false_next" : "node_85"
+          "false_next" : "node_63"
         },
         {
-          "name" : "node_85",
-          "id" : 29,
+          "name" : "node_63",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 136,
@@ -19002,11 +18873,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_29"
+          "true_next" : "tbl_act_16"
         },
         {
-          "name" : "node_92",
-          "id" : 30,
+          "name" : "node_70",
+          "id" : 23,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -19019,11 +18890,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_93"
+          "true_next" : "node_71"
         },
         {
-          "name" : "node_93",
-          "id" : 31,
+          "name" : "node_71",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 235,
@@ -19042,11 +18913,11 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "false_next" : "node_97"
+          "false_next" : "node_75"
         },
         {
-          "name" : "node_97",
-          "id" : 32,
+          "name" : "node_75",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 247,
@@ -19074,15 +18945,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 93,
+        "line" : 91,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_103",
+      "init_table" : "node_81",
       "tables" : [
         {
-          "name" : "tbl_act_37",
-          "id" : 66,
+          "name" : "tbl_act_24",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -19096,22 +18967,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [152],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_105",
+          "action_ids" : [138],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_83",
           "next_tables" : {
-            "act_37" : "node_105"
+            "act_24" : "node_83"
           },
           "default_entry" : {
-            "action_id" : 152,
+            "action_id" : 138,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_38",
-          "id" : 67,
+          "name" : "tbl_act_25",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -19125,22 +18996,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
-          "actions" : ["act_38"],
-          "base_default_next" : "node_107",
+          "action_ids" : [139],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_85",
           "next_tables" : {
-            "act_38" : "node_107"
+            "act_25" : "node_85"
           },
           "default_entry" : {
-            "action_id" : 153,
+            "action_id" : 139,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_39",
-          "id" : 68,
+          "name" : "tbl_act_26",
+          "id" : 53,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 337,
@@ -19154,14 +19025,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
-          "actions" : ["act_39"],
-          "base_default_next" : "node_109",
+          "action_ids" : [140],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_87",
           "next_tables" : {
-            "act_39" : "node_109"
+            "act_26" : "node_87"
           },
           "default_entry" : {
-            "action_id" : 154,
+            "action_id" : 140,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19169,7 +19040,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 69,
+          "id" : 54,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 341,
@@ -19183,14 +19054,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [146],
+          "action_ids" : [131],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
-          "base_default_next" : "node_113",
+          "base_default_next" : "node_91",
           "next_tables" : {
-            "FabricEgress.egress_next.pop_mpls_if_present" : "node_113"
+            "FabricEgress.egress_next.pop_mpls_if_present" : "node_91"
           },
           "default_entry" : {
-            "action_id" : 146,
+            "action_id" : 131,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19198,7 +19069,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 70,
+          "id" : 55,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 343,
@@ -19212,14 +19083,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
+          "action_ids" : [132],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
-          "base_default_next" : "node_113",
+          "base_default_next" : "node_91",
           "next_tables" : {
-            "FabricEgress.egress_next.set_mpls" : "node_113"
+            "FabricEgress.egress_next.set_mpls" : "node_91"
           },
           "default_entry" : {
-            "action_id" : 147,
+            "action_id" : 132,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19227,7 +19098,7 @@
         },
         {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 71,
+          "id" : 56,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 349,
@@ -19241,14 +19112,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
+          "action_ids" : [133],
           "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" : 148,
+            "action_id" : 133,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19256,7 +19127,7 @@
         },
         {
           "name" : "tbl_egress_next_push_inner_vlan",
-          "id" : 72,
+          "id" : 57,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 350,
@@ -19270,22 +19141,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [150],
+          "action_ids" : [135],
           "actions" : ["FabricEgress.egress_next.push_inner_vlan"],
-          "base_default_next" : "node_123",
+          "base_default_next" : "node_101",
           "next_tables" : {
-            "FabricEgress.egress_next.push_inner_vlan" : "node_123"
+            "FabricEgress.egress_next.push_inner_vlan" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 150,
+            "action_id" : 135,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_40",
-          "id" : 73,
+          "name" : "tbl_act_27",
+          "id" : 58,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 353,
@@ -19299,14 +19170,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [157],
-          "actions" : ["act_42"],
+          "action_ids" : [143],
+          "actions" : ["act_29"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
-            "act_42" : "FabricEgress.egress_next.egress_vlan"
+            "act_29" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 157,
+            "action_id" : 143,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19314,7 +19185,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 74,
+          "id" : 59,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -19341,23 +19212,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [151, 103],
+          "action_ids" : [136, 89],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_41",
-            "__MISS__" : "tbl_act_42"
+            "__HIT__" : "tbl_act_28",
+            "__MISS__" : "tbl_act_29"
           },
           "default_entry" : {
-            "action_id" : 103,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_41",
-          "id" : 75,
+          "name" : "tbl_act_28",
+          "id" : 60,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -19365,22 +19236,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
-          "actions" : ["act_40"],
-          "base_default_next" : "node_120",
+          "action_ids" : [141],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_98",
           "next_tables" : {
-            "act_40" : "node_120"
+            "act_27" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 155,
+            "action_id" : 141,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_42",
-          "id" : 76,
+          "name" : "tbl_act_29",
+          "id" : 61,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -19388,14 +19259,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
-          "actions" : ["act_41"],
-          "base_default_next" : "node_120",
+          "action_ids" : [142],
+          "actions" : ["act_28"],
+          "base_default_next" : "node_98",
           "next_tables" : {
-            "act_41" : "node_120"
+            "act_28" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 156,
+            "action_id" : 142,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19403,7 +19274,7 @@
         },
         {
           "name" : "tbl_egress_next_push_vlan_0",
-          "id" : 77,
+          "id" : 62,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 360,
@@ -19417,22 +19288,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149],
+          "action_ids" : [134],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_123",
+          "base_default_next" : "node_101",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_123"
+            "FabricEgress.egress_next.push_vlan" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 149,
+            "action_id" : 134,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_43",
-          "id" : 78,
+          "name" : "tbl_act_30",
+          "id" : 63,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 369,
@@ -19446,22 +19317,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [159],
-          "actions" : ["act_44"],
-          "base_default_next" : "node_125",
+          "action_ids" : [145],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_103",
           "next_tables" : {
-            "act_44" : "node_125"
+            "act_31" : "node_103"
           },
           "default_entry" : {
-            "action_id" : 159,
+            "action_id" : 145,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_44",
-          "id" : 79,
+          "name" : "tbl_act_31",
+          "id" : 64,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 370,
@@ -19475,22 +19346,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["act_43"],
-          "base_default_next" : "tbl_act_49",
+          "action_ids" : [144],
+          "actions" : ["act_30"],
+          "base_default_next" : "tbl_act_36",
           "next_tables" : {
-            "act_43" : "tbl_act_49"
+            "act_30" : "tbl_act_36"
           },
           "default_entry" : {
-            "action_id" : 158,
+            "action_id" : 144,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_45",
-          "id" : 80,
+          "name" : "tbl_act_32",
+          "id" : 65,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 373,
@@ -19504,22 +19375,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [161],
-          "actions" : ["act_46"],
-          "base_default_next" : "node_129",
+          "action_ids" : [147],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_107",
           "next_tables" : {
-            "act_46" : "node_129"
+            "act_33" : "node_107"
           },
           "default_entry" : {
-            "action_id" : 161,
+            "action_id" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_46",
-          "id" : 81,
+          "name" : "tbl_act_33",
+          "id" : 66,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 374,
@@ -19533,22 +19404,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [160],
-          "actions" : ["act_45"],
-          "base_default_next" : "tbl_act_49",
+          "action_ids" : [146],
+          "actions" : ["act_32"],
+          "base_default_next" : "tbl_act_36",
           "next_tables" : {
-            "act_45" : "tbl_act_49"
+            "act_32" : "tbl_act_36"
           },
           "default_entry" : {
-            "action_id" : 160,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_47",
-          "id" : 82,
+          "name" : "tbl_act_34",
+          "id" : 67,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 378,
@@ -19562,22 +19433,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [163],
-          "actions" : ["act_48"],
-          "base_default_next" : "node_133",
+          "action_ids" : [149],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_111",
           "next_tables" : {
-            "act_48" : "node_133"
+            "act_35" : "node_111"
           },
           "default_entry" : {
-            "action_id" : 163,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_48",
-          "id" : 83,
+          "name" : "tbl_act_35",
+          "id" : 68,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 379,
@@ -19591,27 +19462,50 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [162],
-          "actions" : ["act_47"],
-          "base_default_next" : "tbl_act_49",
+          "action_ids" : [148],
+          "actions" : ["act_34"],
+          "base_default_next" : "tbl_act_36",
           "next_tables" : {
-            "act_47" : "tbl_act_49"
+            "act_34" : "tbl_act_36"
           },
           "default_entry" : {
-            "action_id" : 162,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_49",
-          "id" : 84,
+          "name" : "tbl_act_36",
+          "id" : 69,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [151],
+          "actions" : ["act_37"],
+          "base_default_next" : "node_114",
+          "next_tables" : {
+            "act_37" : "node_114"
+          },
+          "default_entry" : {
+            "action_id" : 151,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_37",
+          "id" : 70,
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 288,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+            "filename" : "include/control/spgw.p4",
+            "line" : 345,
+            "column" : 46,
+            "source_fragment" : "return"
           },
           "key" : [],
           "match_type" : "exact",
@@ -19620,14 +19514,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [164],
-          "actions" : ["act_49"],
-          "base_default_next" : "node_136",
+          "action_ids" : [150],
+          "actions" : ["act_36"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "act_49" : "node_136"
+            "act_36" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 164,
+            "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" : 346,
+            "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
@@ -19635,10 +19558,10 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 85,
+          "id" : 72,
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 291,
+            "filename" : "include/control/spgw.p4",
+            "line" : 349,
             "column" : 12,
             "source_fragment" : "gtpu_encap()"
           },
@@ -19649,14 +19572,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
+          "action_ids" : [137],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_138",
+          "base_default_next" : "node_120",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_138"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_120"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 137,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19664,7 +19587,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 86,
+          "id" : 73,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 297,
@@ -19678,14 +19601,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
+          "action_ids" : [92],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
-          "base_default_next" : "node_143",
+          "base_default_next" : "node_125",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v4" : "node_143"
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_125"
           },
           "default_entry" : {
-            "action_id" : 107,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19693,7 +19616,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v6",
-          "id" : 87,
+          "id" : 74,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 302,
@@ -19707,14 +19630,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
+          "action_ids" : [93],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v6"],
-          "base_default_next" : "node_143",
+          "base_default_next" : "node_125",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v6" : "node_143"
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_125"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19722,7 +19645,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 88,
+          "id" : 75,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -19761,23 +19684,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109, 100],
+          "action_ids" : [94, 86],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_146",
+          "base_default_next" : "node_128",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_146",
-            "nop" : "node_146"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_128",
+            "nop" : "node_128"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_50",
-          "id" : 89,
+          "name" : "tbl_act_39",
+          "id" : 76,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -19785,14 +19708,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [165],
-          "actions" : ["act_50"],
+          "action_ids" : [153],
+          "actions" : ["act_39"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_50" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_39" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 165,
+            "action_id" : 153,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19800,7 +19723,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 90,
+          "id" : 77,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -19821,23 +19744,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [110, 101],
+          "action_ids" : [95, 87],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_149",
+          "base_default_next" : "node_131",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_149",
-            "nop" : "node_149"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_131",
+            "nop" : "node_131"
           },
           "default_entry" : {
-            "action_id" : 101,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_51",
-          "id" : 91,
+          "name" : "tbl_act_40",
+          "id" : 78,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -19851,14 +19774,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [166],
-          "actions" : ["act_51"],
-          "base_default_next" : "node_151",
+          "action_ids" : [154],
+          "actions" : ["act_40"],
+          "base_default_next" : "node_133",
           "next_tables" : {
-            "act_51" : "node_151"
+            "act_40" : "node_133"
           },
           "default_entry" : {
-            "action_id" : 166,
+            "action_id" : 154,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19866,7 +19789,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 92,
+          "id" : 79,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -19887,7 +19810,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 104],
+          "action_ids" : [96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 90],
           "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" : {
@@ -19910,7 +19833,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 90,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -19930,7 +19853,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 96,
                 "action_data" : []
               },
               "priority" : 1
@@ -19949,7 +19872,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 97,
                 "action_data" : []
               },
               "priority" : 2
@@ -19968,7 +19891,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 98,
                 "action_data" : []
               },
               "priority" : 3
@@ -19987,7 +19910,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 99,
                 "action_data" : []
               },
               "priority" : 4
@@ -20006,7 +19929,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 100,
                 "action_data" : []
               },
               "priority" : 5
@@ -20025,7 +19948,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 101,
                 "action_data" : []
               },
               "priority" : 6
@@ -20044,7 +19967,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 102,
                 "action_data" : []
               },
               "priority" : 7
@@ -20063,7 +19986,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 118,
+                "action_id" : 103,
                 "action_data" : []
               },
               "priority" : 8
@@ -20082,7 +20005,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 119,
+                "action_id" : 104,
                 "action_data" : []
               },
               "priority" : 9
@@ -20101,7 +20024,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 120,
+                "action_id" : 105,
                 "action_data" : []
               },
               "priority" : 10
@@ -20120,7 +20043,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 121,
+                "action_id" : 106,
                 "action_data" : []
               },
               "priority" : 11
@@ -20139,7 +20062,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 122,
+                "action_id" : 107,
                 "action_data" : []
               },
               "priority" : 12
@@ -20158,7 +20081,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 123,
+                "action_id" : 108,
                 "action_data" : []
               },
               "priority" : 13
@@ -20177,7 +20100,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 124,
+                "action_id" : 109,
                 "action_data" : []
               },
               "priority" : 14
@@ -20196,7 +20119,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 125,
+                "action_id" : 110,
                 "action_data" : []
               },
               "priority" : 15
@@ -20215,7 +20138,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 126,
+                "action_id" : 111,
                 "action_data" : []
               },
               "priority" : 16
@@ -20224,7 +20147,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 93,
+          "id" : 80,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -20245,30 +20168,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 105],
+          "action_ids" : [112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 91],
           "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_52",
+          "base_default_next" : "tbl_act_41",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_52",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_52",
-            "NoAction" : "tbl_act_52"
+            "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"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 91,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20288,7 +20211,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 127,
+                "action_id" : 112,
                 "action_data" : []
               },
               "priority" : 1
@@ -20307,7 +20230,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 128,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 2
@@ -20326,7 +20249,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 129,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 3
@@ -20345,7 +20268,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 130,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 4
@@ -20364,7 +20287,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 131,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 5
@@ -20383,7 +20306,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 132,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 6
@@ -20402,7 +20325,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 133,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 7
@@ -20421,7 +20344,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 134,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 8
@@ -20440,7 +20363,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 135,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 9
@@ -20459,7 +20382,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 136,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 10
@@ -20478,7 +20401,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 137,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 11
@@ -20497,7 +20420,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 138,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 12
@@ -20516,7 +20439,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 139,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 13
@@ -20535,7 +20458,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 140,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 14
@@ -20554,7 +20477,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 141,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 15
@@ -20573,7 +20496,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 142,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 16
@@ -20581,8 +20504,8 @@
           ]
         },
         {
-          "name" : "tbl_act_52",
-          "id" : 94,
+          "name" : "tbl_act_41",
+          "id" : 81,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -20596,22 +20519,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [168],
-          "actions" : ["act_53"],
-          "base_default_next" : "node_155",
+          "action_ids" : [156],
+          "actions" : ["act_42"],
+          "base_default_next" : "node_137",
           "next_tables" : {
-            "act_53" : "node_155"
+            "act_42" : "node_137"
           },
           "default_entry" : {
-            "action_id" : 168,
+            "action_id" : 156,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_53",
-          "id" : 95,
+          "name" : "tbl_act_42",
+          "id" : 82,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -20625,22 +20548,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [167],
-          "actions" : ["act_52"],
-          "base_default_next" : "node_157",
+          "action_ids" : [155],
+          "actions" : ["act_41"],
+          "base_default_next" : "node_139",
           "next_tables" : {
-            "act_52" : "node_157"
+            "act_41" : "node_139"
           },
           "default_entry" : {
-            "action_id" : 167,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_54",
-          "id" : 96,
+          "name" : "tbl_act_43",
+          "id" : 83,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -20654,22 +20577,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [169],
-          "actions" : ["act_54"],
-          "base_default_next" : "node_159",
+          "action_ids" : [157],
+          "actions" : ["act_43"],
+          "base_default_next" : "node_141",
           "next_tables" : {
-            "act_54" : "node_159"
+            "act_43" : "node_141"
           },
           "default_entry" : {
-            "action_id" : 169,
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_55",
-          "id" : 97,
+          "name" : "tbl_act_44",
+          "id" : 84,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -20683,14 +20606,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [170],
-          "actions" : ["act_55"],
-          "base_default_next" : "node_161",
+          "action_ids" : [158],
+          "actions" : ["act_44"],
+          "base_default_next" : "node_143",
           "next_tables" : {
-            "act_55" : "node_161"
+            "act_44" : "node_143"
           },
           "default_entry" : {
-            "action_id" : 170,
+            "action_id" : 158,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20698,7 +20621,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 98,
+          "id" : 85,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 86,
@@ -20712,15 +20635,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [143, 102],
+          "action_ids" : [128, 88],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_163",
+          "base_default_next" : "node_145",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_163",
-            "nop" : "node_163"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_145",
+            "nop" : "node_145"
           },
           "default_entry" : {
-            "action_id" : 102,
+            "action_id" : 88,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20728,7 +20651,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 99,
+          "id" : 86,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -20742,14 +20665,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [144],
+          "action_ids" : [129],
           "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" : 144,
+            "action_id" : 129,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20757,7 +20680,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 100,
+          "id" : 87,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -20771,14 +20694,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [145],
+          "action_ids" : [130],
           "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" : 145,
+            "action_id" : 130,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20788,8 +20711,8 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_103",
-          "id" : 33,
+          "name" : "node_81",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 39,
@@ -20817,12 +20740,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_105"
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_83"
         },
         {
-          "name" : "node_105",
-          "id" : 34,
+          "name" : "node_83",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -20843,12 +20766,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_38",
-          "false_next" : "node_107"
+          "true_next" : "tbl_act_25",
+          "false_next" : "node_85"
         },
         {
-          "name" : "node_107",
-          "id" : 35,
+          "name" : "node_85",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 335,
@@ -20896,12 +20819,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_39",
-          "false_next" : "node_109"
+