diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricCapabilities.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricCapabilities.java
index 19b3206..2eb947d 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricCapabilities.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricCapabilities.java
@@ -17,6 +17,7 @@
 package org.onosproject.pipelines.fabric.impl.behaviour;
 
 import org.onosproject.net.pi.model.PiPipeconf;
+import org.onosproject.pipelines.fabric.FabricConstants;
 import org.slf4j.Logger;
 
 import java.io.BufferedReader;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java
deleted file mode 100644
index b8a3143..0000000
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java
+++ /dev/null
@@ -1,389 +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.
- */
-
-package org.onosproject.pipelines.fabric.impl.behaviour;
-
-import org.onosproject.net.pi.model.PiActionId;
-import org.onosproject.net.pi.model.PiActionParamId;
-import org.onosproject.net.pi.model.PiActionProfileId;
-import org.onosproject.net.pi.model.PiMeterId;
-import org.onosproject.net.pi.model.PiPacketMetadataId;
-import org.onosproject.net.pi.model.PiCounterId;
-import org.onosproject.net.pi.model.PiMatchFieldId;
-import org.onosproject.net.pi.model.PiTableId;
-/**
- * Constants for fabric pipeline.
- */
-public final class FabricConstants {
-
-    // hide default constructor
-    private FabricConstants() {
-    }
-
-    // Header field IDs
-    public static final PiMatchFieldId HDR_IG_PORT =
-            PiMatchFieldId.of("ig_port");
-    public static final PiMatchFieldId HDR_VLAN_IS_VALID =
-            PiMatchFieldId.of("vlan_is_valid");
-    public static final PiMatchFieldId HDR_IPV6_SRC_NET_ID =
-            PiMatchFieldId.of("ipv6_src_net_id");
-    public static final PiMatchFieldId HDR_C_TAG = PiMatchFieldId.of("c_tag");
-    public static final PiMatchFieldId HDR_IPV4_SRC =
-            PiMatchFieldId.of("ipv4_src");
-    public static final PiMatchFieldId HDR_IPV6_DST =
-            PiMatchFieldId.of("ipv6_dst");
-    public static final PiMatchFieldId HDR_L4_DPORT =
-            PiMatchFieldId.of("l4_dport");
-    public static final PiMatchFieldId HDR_PPPOE_CODE =
-            PiMatchFieldId.of("pppoe_code");
-    public static final PiMatchFieldId HDR_IPV6_SRC =
-            PiMatchFieldId.of("ipv6_src");
-    public static final PiMatchFieldId HDR_ETH_SRC =
-            PiMatchFieldId.of("eth_src");
-    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_ETH_DST =
-            PiMatchFieldId.of("eth_dst");
-    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_TUNNEL_IPV4_DST =
-            PiMatchFieldId.of("tunnel_ipv4_dst");
-    public static final PiMatchFieldId HDR_ETH_TYPE =
-            PiMatchFieldId.of("eth_type");
-    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_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_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_IPV4_DSCP =
-            PiMatchFieldId.of("ipv4_dscp");
-    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_INT_IS_VALID =
-            PiMatchFieldId.of("int_is_valid");
-    public static final PiMatchFieldId HDR_MPLS_LABEL =
-            PiMatchFieldId.of("mpls_label");
-    public static final PiMatchFieldId HDR_IP_PROTO =
-            PiMatchFieldId.of("ip_proto");
-    public static final PiMatchFieldId HDR_PPPOE_PROTOCOL =
-            PiMatchFieldId.of("pppoe_protocol");
-    // Table IDs
-    public static final PiTableId FABRIC_INGRESS_NEXT_HASHED =
-            PiTableId.of("FabricIngress.next.hashed");
-    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_T_LINE_MAP =
-            PiTableId.of("FabricIngress.bng_ingress.t_line_map");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_FAR_LOOKUP =
-            PiTableId.of("FabricIngress.spgw_ingress.far_lookup");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INSERT =
-            PiTableId.of("FabricEgress.process_int_main.process_int_transit.tb_int_insert");
-    public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
-            PiTableId.of("FabricIngress.filtering.fwd_classifier");
-    public static final PiTableId FABRIC_INGRESS_NEXT_XCONNECT =
-            PiTableId.of("FabricIngress.next.xconnect");
-    public static final PiTableId FABRIC_INGRESS_NEXT_NEXT_VLAN =
-            PiTableId.of("FabricIngress.next.next_vlan");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DOWNLINK_PDR_LOOKUP =
-            PiTableId.of("FabricIngress.spgw_ingress.downlink_pdr_lookup");
-    public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
-            PiTableId.of("FabricIngress.next.simple");
-    public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
-            PiTableId.of("FabricIngress.next.multicast");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UPLINK_PDR_LOOKUP =
-            PiTableId.of("FabricIngress.spgw_ingress.uplink_pdr_lookup");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_TB_INT_SOURCE =
-            PiTableId.of("FabricEgress.process_int_main.process_int_source.tb_int_source");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V6 =
-            PiTableId.of("FabricIngress.forwarding.routing_v6");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_MPLS =
-            PiTableId.of("FabricIngress.forwarding.mpls");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V4 =
-            PiTableId.of("FabricIngress.forwarding.routing_v4");
-    public static final PiTableId FABRIC_INGRESS_ACL_ACL =
-            PiTableId.of("FabricIngress.acl.acl");
-    public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
-            PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
-    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_CP =
-            PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_cp");
-    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_TERM_V4 =
-            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_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 =
-            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_TB_GENERATE_REPORT =
-            PiTableId.of("FabricEgress.process_int_main.process_int_report.tb_generate_report");
-    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE =
-            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_source");
-    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_QOS_V6 =
-            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");
-    // 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_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 =
-            PiCounterId.of("FabricIngress.bng_ingress.upstream.c_dropped");
-    public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_C_CONTROL =
-            PiCounterId.of("FabricIngress.bng_ingress.upstream.c_control");
-    public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_C_TERMINATED =
-            PiCounterId.of("FabricIngress.bng_ingress.upstream.c_terminated");
-    public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_C_LINE_RX =
-            PiCounterId.of("FabricIngress.bng_ingress.downstream.c_line_rx");
-    public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_INGRESS_PORT_COUNTER =
-            PiCounterId.of("FabricIngress.port_counters_control.ingress_port_counter");
-    // Direct Counter IDs
-    public static final PiCounterId FABRIC_INGRESS_NEXT_MULTICAST_COUNTER =
-            PiCounterId.of("FabricIngress.next.multicast_counter");
-    public static final PiCounterId FABRIC_INGRESS_NEXT_SIMPLE_COUNTER =
-            PiCounterId.of("FabricIngress.next.simple_counter");
-    public static final PiCounterId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER_COUNTER =
-            PiCounterId.of("FabricIngress.filtering.fwd_classifier_counter");
-    public static final PiCounterId FABRIC_INGRESS_FORWARDING_BRIDGING_COUNTER =
-            PiCounterId.of("FabricIngress.forwarding.bridging_counter");
-    public static final PiCounterId FABRIC_INGRESS_NEXT_HASHED_COUNTER =
-            PiCounterId.of("FabricIngress.next.hashed_counter");
-    public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SOURCE =
-            PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_source");
-    public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_COUNTER_INT_SOURCE =
-            PiCounterId.of("FabricEgress.process_int_main.process_int_source.counter_int_source");
-    public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SINK =
-            PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_sink");
-    public static final PiCounterId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN_COUNTER =
-            PiCounterId.of("FabricEgress.egress_next.egress_vlan_counter");
-    public static final PiCounterId FABRIC_INGRESS_ACL_ACL_COUNTER =
-            PiCounterId.of("FabricIngress.acl.acl_counter");
-    public static final PiCounterId FABRIC_INGRESS_NEXT_XCONNECT_COUNTER =
-            PiCounterId.of("FabricIngress.next.xconnect_counter");
-    public static final PiCounterId FABRIC_INGRESS_NEXT_NEXT_VLAN_COUNTER =
-            PiCounterId.of("FabricIngress.next.next_vlan_counter");
-    public static final PiCounterId FABRIC_INGRESS_FORWARDING_ROUTING_V6_COUNTER =
-            PiCounterId.of("FabricIngress.forwarding.routing_v6_counter");
-    public static final PiCounterId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN_COUNTER =
-            PiCounterId.of("FabricIngress.filtering.ingress_port_vlan_counter");
-    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 =
-            PiActionId.of("FabricIngress.forwarding.nop_routing_v4");
-    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_QOS_BESTEFF =
-            PiActionId.of("FabricIngress.bng_ingress.downstream.qos_besteff");
-    public static final PiActionId FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN =
-            PiActionId.of("FabricIngress.filtering.permit_with_internal_vlan");
-    public static final PiActionId FABRIC_INGRESS_NEXT_ROUTING_HASHED =
-            PiActionId.of("FabricIngress.next.routing_hashed");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING =
-            PiActionId.of("FabricIngress.forwarding.set_next_id_bridging");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_INT_SOURCE_DSCP =
-            PiActionId.of("FabricEgress.process_int_main.process_int_source.int_source_dscp");
-    public static final PiActionId FABRIC_INGRESS_NEXT_SET_DOUBLE_VLAN =
-            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_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 =
-            PiActionId.of("FabricIngress.bng_ingress.upstream.punt_to_cpu");
-    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_DROP =
-            PiActionId.of("FabricIngress.bng_ingress.downstream.drop");
-    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_PDR_ATTRIBUTES =
-            PiActionId.of("FabricIngress.spgw_ingress.set_pdr_attributes");
-    public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN =
-            PiActionId.of("FabricIngress.next.set_vlan");
-    public static final PiActionId FABRIC_INGRESS_ACL_NOP_ACL =
-            PiActionId.of("FabricIngress.acl.nop_acl");
-    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_LOAD_NORMAL_FAR_ATTRIBUTES =
-            PiActionId.of("FabricIngress.spgw_ingress.load_normal_far_attributes");
-    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_SET_LINE =
-            PiActionId.of("FabricIngress.bng_ingress.set_line");
-    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_TERM_DISABLED =
-            PiActionId.of("FabricIngress.bng_ingress.upstream.term_disabled");
-    public static final PiActionId FABRIC_INGRESS_ACL_SET_NEXT_ID_ACL =
-            PiActionId.of("FabricIngress.acl.set_next_id_acl");
-    public static final PiActionId FABRIC_INGRESS_FILTERING_PERMIT =
-            PiActionId.of("FabricIngress.filtering.permit");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4 =
-            PiActionId.of("FabricIngress.forwarding.set_next_id_routing_v4");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V6 =
-            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_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 =
-            PiActionId.of("FabricEgress.bng_egress.downstream.encap_v6");
-    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_SIMPLE =
-            PiActionId.of("FabricIngress.next.mpls_routing_simple");
-    public static final PiActionId FABRIC_INGRESS_ACL_PUNT_TO_CPU =
-            PiActionId.of("FabricIngress.acl.punt_to_cpu");
-    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_QOS_PRIO =
-            PiActionId.of("FabricIngress.bng_ingress.downstream.qos_prio");
-    public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
-            PiActionId.of("FabricEgress.egress_next.pop_vlan");
-    public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SINK =
-            PiActionId.of("FabricIngress.process_set_source_sink.int_set_sink");
-    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_HASHED =
-            PiActionId.of("FabricIngress.next.mpls_routing_hashed");
-    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_TERM_ENABLED_V6 =
-            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 =
-            PiActionId.of("FabricIngress.bng_ingress.downstream.set_session");
-    public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP_ID =
-            PiActionId.of("FabricIngress.next.set_mcast_group_id");
-    public static final PiActionId FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE =
-            PiActionId.of("FabricIngress.filtering.set_forwarding_type");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_DO_REPORT_ENCAPSULATION =
-            PiActionId.of("FabricEgress.process_int_main.process_int_report.do_report_encapsulation");
-    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_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");
-    public static final PiActionParamId CLONE_ID =
-            PiActionParamId.of("clone_id");
-    public static final PiActionParamId FAR_ID = PiActionParamId.of("far_id");
-    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");
-    public static final PiActionParamId MON_IP = PiActionParamId.of("mon_ip");
-    public static final PiActionParamId INS_MASK0003 =
-            PiActionParamId.of("ins_mask0003");
-    public static final PiActionParamId LINE_ID = PiActionParamId.of("line_id");
-    public static final PiActionParamId FWD_TYPE =
-            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");
-    public static final PiActionParamId DROP = PiActionParamId.of("drop");
-    public static final PiActionParamId PORT_NUM =
-            PiActionParamId.of("port_num");
-    public static final PiActionParamId TUNNEL_DST_ADDR =
-            PiActionParamId.of("tunnel_dst_addr");
-    public static final PiActionParamId GROUP_ID =
-            PiActionParamId.of("group_id");
-    public static final PiActionParamId MAX_HOP = PiActionParamId.of("max_hop");
-    // Action Profile IDs
-    public static final PiActionProfileId FABRIC_INGRESS_NEXT_HASHED_SELECTOR =
-            PiActionProfileId.of("FabricIngress.next.hashed_selector");
-    // Packet Metadata IDs
-    public static final PiPacketMetadataId INGRESS_PORT =
-            PiPacketMetadataId.of("ingress_port");
-    public static final PiPacketMetadataId EGRESS_PORT =
-            PiPacketMetadataId.of("egress_port");
-    // Meter IDs
-    public static final PiMeterId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_M_BESTEFF =
-            PiMeterId.of("FabricIngress.bng_ingress.downstream.m_besteff");
-    public static final PiMeterId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_M_PRIO =
-            PiMeterId.of("FabricIngress.bng_ingress.downstream.m_prio");
-}
\ No newline at end of file
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricIntProgrammable.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricIntProgrammable.java
index c5fa272..7f9e35e 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricIntProgrammable.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricIntProgrammable.java
@@ -42,6 +42,7 @@
 import org.onosproject.net.pi.model.PiTableId;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.pipelines.fabric.FabricConstants;
 import org.onosproject.pipelines.fabric.impl.FabricPipeconfLoader;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java
index 816c0dd..9d19e00 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreter.java
@@ -40,6 +40,7 @@
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiPacketMetadata;
 import org.onosproject.net.pi.runtime.PiPacketOperation;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.nio.ByteBuffer;
 import java.util.Collection;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricPortStatisticsDiscovery.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricPortStatisticsDiscovery.java
index b461ad3..219e370 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricPortStatisticsDiscovery.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricPortStatisticsDiscovery.java
@@ -19,6 +19,7 @@
 
 import org.onosproject.net.pi.model.PiCounterId;
 import org.onosproject.pipelines.basic.PortStatisticsDiscoveryImpl;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 /**
  * Implementation of the PortStatisticsBehaviour for fabric.p4.
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java
index 78ef9a7..21ff675 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricTreatmentInterpreter.java
@@ -31,6 +31,7 @@
 import org.onosproject.net.pi.model.PiTableId;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/FabricBngProgrammable.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/FabricBngProgrammable.java
index 1a08e73..2191071 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/FabricBngProgrammable.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/FabricBngProgrammable.java
@@ -46,7 +46,7 @@
 import org.onosproject.net.pi.runtime.PiExactFieldMatch;
 import org.onosproject.p4runtime.api.P4RuntimeWriteClient;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricCapabilities;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/PuntCpuCriterionFactory.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/PuntCpuCriterionFactory.java
index ff40563..8f63fe4 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/PuntCpuCriterionFactory.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/bng/PuntCpuCriterionFactory.java
@@ -19,7 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import org.onosproject.net.flow.criteria.Criterion;
 import org.onosproject.net.flow.criteria.PiCriterion;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.Set;
 import java.util.stream.Collectors;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FilteringObjectiveTranslator.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FilteringObjectiveTranslator.java
index ae97a54..162bb1e 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FilteringObjectiveTranslator.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FilteringObjectiveTranslator.java
@@ -40,7 +40,7 @@
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricCapabilities;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricUtils;
 
 import java.util.Collection;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/ForwardingObjectiveTranslator.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/ForwardingObjectiveTranslator.java
index 2cb7ba5..0ab5beb 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/ForwardingObjectiveTranslator.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/ForwardingObjectiveTranslator.java
@@ -48,7 +48,7 @@
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricCapabilities;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.List;
 import java.util.Map;
diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java
index fb08d07..1e0e52d 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/NextObjectiveTranslator.java
@@ -47,7 +47,7 @@
 import org.onosproject.net.pi.runtime.PiActionProfileGroupId;
 import org.onosproject.net.pi.runtime.PiGroupKey;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricCapabilities;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 import org.onosproject.pipelines.fabric.impl.behaviour.FabricUtils;
 
 import java.util.Collection;
diff --git a/pipelines/fabric/impl/src/main/resources/Makefile b/pipelines/fabric/impl/src/main/resources/Makefile
index 5353342..11cdba9 100644
--- a/pipelines/fabric/impl/src/main/resources/Makefile
+++ b/pipelines/fabric/impl/src/main/resources/Makefile
@@ -26,7 +26,7 @@
 endif
 	docker run -v $(ONOS_ROOT):/onos -w /onos/tools/dev/bin \
 		--entrypoint ./onos-gen-p4-constants opennetworking/p4mn:stable \
-		-o /onos/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricConstants.java \
+		-o /onos/pipelines/fabric/api/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java \
 		fabric /onos/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
 
 clean:
diff --git a/pipelines/fabric/impl/src/main/resources/fabric.p4 b/pipelines/fabric/impl/src/main/resources/fabric.p4
index 9f6b27d..ad3857d 100644
--- a/pipelines/fabric/impl/src/main/resources/fabric.p4
+++ b/pipelines/fabric/impl/src/main/resources/fabric.p4
@@ -56,14 +56,14 @@
     PortCountersControl() port_counters_control;
 #endif // WITH_PORT_COUNTER
 #ifdef WITH_SPGW
-    SpgwIngress() spgw_ingress;
+    SpgwIngress() spgw;
 #endif // WITH_SPGW
 
     apply {
         _PRE_INGRESS
         pkt_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
-        spgw_ingress.apply(hdr, fabric_metadata, standard_metadata);
+        spgw.apply(hdr, fabric_metadata, standard_metadata);
 #endif // WITH_SPGW
         filtering.apply(hdr, fabric_metadata, standard_metadata);
         if (fabric_metadata.skip_forwarding == _FALSE) {
@@ -95,7 +95,7 @@
     PacketIoEgress() pkt_io_egress;
     EgressNextControl() egress_next;
 #ifdef WITH_SPGW
-    SpgwEgress() spgw_egress;
+    SpgwEgress() spgw;
 #endif // WITH_SPGW
 
     apply {
@@ -103,7 +103,7 @@
         pkt_io_egress.apply(hdr, fabric_metadata, standard_metadata);
         egress_next.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
-        spgw_egress.apply(hdr, fabric_metadata);
+        spgw.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/control/spgw.p4 b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
index 34a88b8..00bfd94 100644
--- a/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/control/spgw.p4
@@ -30,156 +30,8 @@
 #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 = {
-            hdr.ipv4.dst_addr           : exact @name("tunnel_ipv4_dst");
-            hdr.gtpu.teid               : exact @name("teid");
-        }
-        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;
-
-
+control DecapGtpu(inout parsed_headers_t hdr,
+                  inout fabric_metadata_t fabric_md) {
     @hidden
     action decap_inner_common() {
         // Correct parser-set metadata to use the inner header values
@@ -194,23 +46,27 @@
         hdr.inner_ipv4.setInvalid();
         hdr.gtpu.setInvalid();
     }
+    @hidden
     action decap_inner_tcp() {
         decap_inner_common();
         hdr.udp.setInvalid();
         hdr.tcp = hdr.inner_tcp;
         hdr.inner_tcp.setInvalid();
     }
+    @hidden
     action decap_inner_udp() {
         decap_inner_common();
         hdr.udp = hdr.inner_udp;
         hdr.inner_udp.setInvalid();
     }
+    @hidden
     action decap_inner_icmp() {
         decap_inner_common();
         hdr.udp.setInvalid();
         hdr.icmp = hdr.inner_icmp;
         hdr.inner_icmp.setInvalid();
     }
+    @hidden
     action decap_inner_unknown() {
         decap_inner_common();
         hdr.udp.setInvalid();
@@ -218,9 +74,9 @@
     @hidden
     table decap_gtpu {
         key = {
-            hdr.inner_tcp.isValid()     : exact;
-            hdr.inner_udp.isValid()     : exact;
-            hdr.inner_icmp.isValid()    : exact;
+            hdr.inner_tcp.isValid()  : exact;
+            hdr.inner_udp.isValid()  : exact;
+            hdr.inner_icmp.isValid() : exact;
         }
         actions = {
             decap_inner_tcp;
@@ -234,6 +90,149 @@
             (false, true,  false) : decap_inner_udp();
             (false, false, true)  : decap_inner_icmp();
         }
+        size = 4;
+    }
+    apply {
+        decap_gtpu.apply();
+    }
+}
+
+
+control SpgwIngress(inout parsed_headers_t hdr,
+                    inout fabric_metadata_t fabric_md,
+                    inout standard_metadata_t standard_metadata) {
+
+    //=============================//
+    //===== Misc Things ======//
+    //=============================//
+    
+    counter(MAX_PDR_COUNTERS, CounterType.packets_and_bytes) pdr_counter;
+
+    DecapGtpu() decap_gtpu_from_dbuf;
+    DecapGtpu() decap_gtpu;
+
+
+    //=============================//
+    //===== Interface Tables ======//
+    //=============================//
+
+    action load_iface(spgw_interface_t src_iface) {
+        // Interface type can be access, core, from_dbuf (see InterfaceType enum)
+        fabric_md.spgw.src_iface = src_iface;
+        fabric_md.spgw.skip_spgw = _FALSE;
+    }
+    action iface_miss() {
+        fabric_md.spgw.src_iface = SPGW_IFACE_UNKNOWN;
+        fabric_md.spgw.skip_spgw = _TRUE;
+    }
+
+    // TODO: check also that gtpu.msgtype == GTP_GPDU... somewhere
+    table interfaces {
+        key = {
+            hdr.ipv4.dst_addr  : lpm    @name("ipv4_dst_addr");  // outermost header
+            hdr.gtpu.isValid() : exact  @name("gtpu_is_valid");
+        }
+        actions = {
+            load_iface;
+            @defaultonly iface_miss;
+        }
+        const default_action = iface_miss();
+        size = MAX_INTERFACES;
+    }
+
+
+    //=============================//
+    //===== PDR Tables ======//
+    //=============================//
+
+    action load_pdr(pdr_ctr_id_t ctr_id,
+                    far_id_t far_id,
+                    bit<1> needs_gtpu_decap) {
+        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_pdrs {
+        key = {
+            // only available ipv4 header
+            hdr.ipv4.dst_addr : exact @name("ue_addr");
+        }
+        actions = {
+            load_pdr;
+        }
+        size = MAX_DOWNLINK_PDRS;
+    }
+
+    table uplink_pdrs {
+        key = {
+            hdr.ipv4.dst_addr           : exact @name("tunnel_ipv4_dst");
+            hdr.gtpu.teid               : exact @name("teid");
+        }
+        actions = {
+            load_pdr;
+        }
+        size = MAX_UPLINK_PDRS;
+    }
+
+    //=============================//
+    //===== FAR Tables ======//
+    //=============================//
+
+    action load_normal_far(bit<1> drop,
+                           bit<1> notify_cp) {
+        // general far attributes
+        fabric_md.skip_forwarding = (_BOOL)drop;
+        fabric_md.skip_next = (_BOOL)drop;
+        fabric_md.spgw.notify_spgwc = (_BOOL)notify_cp;
+    }
+    action load_tunnel_far(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.skip_forwarding = (_BOOL)drop;
+        fabric_md.skip_next = (_BOOL)drop;
+        fabric_md.spgw.notify_spgwc = (_BOOL)notify_cp;
+        // GTP tunnel attributes
+        fabric_md.spgw.needs_gtpu_encap = _TRUE;
+        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;
+    }
+
+    action load_dbuf_far(bit<1>    drop,
+                         bit<1>    notify_cp,
+                         bit<16>   tunnel_src_port,
+                         bit<32>   tunnel_src_addr,
+                         bit<32>   tunnel_dst_addr,
+                         teid_t    teid) {
+        load_tunnel_far(drop, notify_cp, tunnel_src_port,
+                                   tunnel_src_addr, tunnel_dst_addr, teid);
+        fabric_md.spgw.skip_egress_pdr_ctr = _TRUE;
+    }
+
+    table fars {
+        key = {
+            fabric_md.spgw.far_id : exact @name("far_id");
+        }
+        actions = {
+            load_normal_far;
+            load_tunnel_far;
+            load_dbuf_far;
+        }
+        // default is drop and don't notify CP
+        const default_action = load_normal_far(1, 0);
+        size = MAX_FARS;
     }
 
 
@@ -243,50 +242,36 @@
     apply {
 
         // Interfaces
-        interface_lookup.apply();
+        if (interfaces.apply().hit) {
+            if (fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF) {
+                decap_gtpu_from_dbuf.apply(hdr, fabric_md);
+            }
+            // PDRs
+            if (hdr.gtpu.isValid()) {
+                uplink_pdrs.apply();
+            } else {
+                downlink_pdrs.apply();
+            }
+            if (fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF) {
+                pdr_counter.count(fabric_md.spgw.ctr_id);
+            }
 
-        // If interface table missed, or the interface skips PDRs/FARs (TODO: is that a thing?)
-        if (fabric_md.spgw.skip_spgw == _TRUE) return;
+            // GTPU Decapsulate
+            if (fabric_md.spgw.needs_gtpu_decap == _TRUE) { 
+                decap_gtpu.apply(hdr, fabric_md);
+            }
 
-        // PDRs
-        // Currently only best-case PDR tables to make v1model-to-tofino compiler happy
-        if (hdr.gtpu.isValid()) {
-            uplink_pdr_lookup.apply();
-        } else {
-            downlink_pdr_lookup.apply();
+            // FARs
+            // Load FAR info
+            fars.apply();
+
+            // Nothing to be done immediately for forwarding or encapsulation.
+            // Forwarding is done by other parts of fabric.p4, and
+            // encapsulation is done in the egress
+
+            // Needed for correct GTPU encapsulation in egress
+            fabric_md.spgw.ipv4_len = hdr.ipv4.total_len;
         }
-        // Inefficient PDR table if efficient tables missed
-        // Removed to make v1model-to-tofino compiler happy. Not removed in TNA port
-        //if (fabric_md.spgw.pdr_hit == _FALSE) {
-        //    flexible_pdr_lookup.apply();
-        //}
-        pdr_counter.count(fabric_md.spgw.ctr_id);
-
-        // GTPU Decapsulate
-        if (fabric_md.spgw.needs_gtpu_decap == _TRUE) { 
-            decap_gtpu.apply();
-        }
-
-        // FARs
-        // Load FAR info
-        far_lookup.apply();
-
-        if (fabric_md.spgw.notify_spgwc == _TRUE) {
-            // TODO: cpu clone action here
-        }
-        if (fabric_md.spgw.far_dropped == _TRUE) {
-            // Do dropping in the same way as fabric's filtering.p4, so we can traverse
-            // the ACL table, which is good for cases like DHCP.
-            fabric_md.skip_forwarding = _TRUE;
-            fabric_md.skip_next = _TRUE;
-        }
-
-        // Nothing to be done immediately for forwarding or encapsulation.
-        // Forwarding is done by other parts of fabric.p4, and
-        // encapsulation is done in the egress
-
-        // Needed for correct GTPU encapsulation in egress
-        fabric_md.spgw.ipv4_len = hdr.ipv4.total_len;
     }
 }
 
@@ -340,11 +325,13 @@
     }
 
     apply {
-        if (fabric_md.spgw.skip_spgw == _TRUE) return;
-        pdr_counter.count(fabric_md.spgw.ctr_id);
-
-        if (fabric_md.spgw.needs_gtpu_encap == _TRUE) {
-            gtpu_encap();
+        if (fabric_md.spgw.skip_spgw == _FALSE) {
+            if (fabric_md.spgw.needs_gtpu_encap == _TRUE) {
+                gtpu_encap();
+            }
+            if (fabric_md.spgw.skip_egress_pdr_ctr == _FALSE) {
+                pdr_counter.count(fabric_md.spgw.ctr_id);
+            }
         }
     }
 }
diff --git a/pipelines/fabric/impl/src/main/resources/include/define.p4 b/pipelines/fabric/impl/src/main/resources/include/define.p4
index bfb7b44..8b1fd9d 100644
--- a/pipelines/fabric/impl/src/main/resources/include/define.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/define.p4
@@ -108,17 +108,7 @@
 const spgw_interface_t SPGW_IFACE_UNKNOWN = 8w0;
 const spgw_interface_t SPGW_IFACE_ACCESS = 8w1;
 const spgw_interface_t SPGW_IFACE_CORE = 8w2;
-const 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
-//  (e.g. via parser value sets)
-#define S1U_SGW_PREFIX (8w140++8w0++8w0++8w0)
-#define S1U_SGW_PREFIX_LEN 8
-#endif
+const spgw_interface_t SPGW_IFACE_FROM_DBUF = 8w3;
 
 const bit<16> ETHERTYPE_QINQ = 0x88A8;
 const bit<16> ETHERTYPE_QINQ_NON_STD = 0x9100;
diff --git a/pipelines/fabric/impl/src/main/resources/include/header.p4 b/pipelines/fabric/impl/src/main/resources/include/header.p4
index 17b36fe..9dc6102 100644
--- a/pipelines/fabric/impl/src/main/resources/include/header.p4
+++ b/pipelines/fabric/impl/src/main/resources/include/header.p4
@@ -139,7 +139,6 @@
 }
 
 struct spgw_meta_t {
-    direction_t       direction;
     bit<16>           ipv4_len;
     teid_t            teid;
     bit<16>           tunnel_src_port;
@@ -149,11 +148,10 @@
     far_id_t          far_id;
     spgw_interface_t  src_iface;
     _BOOL             skip_spgw;
-    _BOOL             pdr_hit;
-    _BOOL             far_dropped;
     _BOOL             notify_spgwc;
     _BOOL             needs_gtpu_encap;
     _BOOL             needs_gtpu_decap;
+    _BOOL             skip_egress_pdr_ctr;
 }
 #endif // WITH_SPGW
 
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index 5e458c2..a44e179 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -1435,7 +1435,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 161,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -1476,7 +1476,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -1541,7 +1541,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -1605,7 +1605,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2963,7 +2963,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 164,
+            "line" : 162,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -3200,7 +3200,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 122,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -3371,7 +3371,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 124,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -3529,7 +3529,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 116,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -3608,7 +3608,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3706,7 +3706,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3823,7 +3823,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3842,7 +3842,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 560e3e9..2cca7f8 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -5,19 +5,18 @@
       "id" : 0,
       "fields" : [
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
+        ["tmp_2", 16, false],
+        ["tmp_3", 4, false],
         ["tmp", 32, false],
-        ["tmp_3", 32, false],
+        ["tmp_0", 32, false],
         ["tmp_4", 32, false],
         ["bng_ingress_upstream_tmp", 1, false],
         ["bng_ingress_downstream_tmp", 1, false],
-        ["spgw_ingress_hasReturned", 1, false],
+        ["spgw_tmp", 1, false],
         ["bng_ingress_upstream_hasReturned", 1, false],
         ["key_0", 64, false],
         ["egress_next_tmp", 1, false],
-        ["spgw_egress_hasReturned", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
         ["fabric_metadata_t._ip_eth_type0", 16, false],
         ["fabric_metadata_t._vlan_id1", 12, false],
@@ -42,36 +41,34 @@
         ["fabric_metadata_t._ipv4_dst_addr20", 32, false],
         ["fabric_metadata_t._inner_l4_sport21", 16, false],
         ["fabric_metadata_t._inner_l4_dport22", 16, false],
-        ["fabric_metadata_t._spgw_direction23", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len24", 16, false],
-        ["fabric_metadata_t._spgw_teid25", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_port26", 16, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr27", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr28", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id29", 32, false],
-        ["fabric_metadata_t._spgw_far_id30", 32, false],
-        ["fabric_metadata_t._spgw_src_iface31", 8, false],
-        ["fabric_metadata_t._spgw_skip_spgw32", 1, false],
-        ["fabric_metadata_t._spgw_pdr_hit33", 1, false],
-        ["fabric_metadata_t._spgw_far_dropped34", 1, false],
-        ["fabric_metadata_t._spgw_notify_spgwc35", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_encap36", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_decap37", 1, false],
-        ["fabric_metadata_t._bng_type38", 2, false],
-        ["fabric_metadata_t._bng_line_id39", 32, false],
-        ["fabric_metadata_t._bng_pppoe_session_id40", 16, false],
-        ["fabric_metadata_t._bng_ds_meter_result41", 32, false],
-        ["fabric_metadata_t._bng_s_tag42", 12, false],
-        ["fabric_metadata_t._bng_c_tag43", 12, false],
-        ["fabric_metadata_t._int_meta_source44", 1, false],
-        ["fabric_metadata_t._int_meta_transit45", 1, false],
-        ["fabric_metadata_t._int_meta_sink46", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id47", 32, false],
-        ["fabric_metadata_t._int_meta_new_words48", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes49", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp50", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp51", 32, false],
-        ["_padding_0", 6, false]
+        ["fabric_metadata_t._spgw_ipv4_len23", 16, false],
+        ["fabric_metadata_t._spgw_teid24", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_src_port25", 16, false],
+        ["fabric_metadata_t._spgw_tunnel_src_addr26", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_dst_addr27", 32, false],
+        ["fabric_metadata_t._spgw_ctr_id28", 32, false],
+        ["fabric_metadata_t._spgw_far_id29", 32, false],
+        ["fabric_metadata_t._spgw_src_iface30", 8, false],
+        ["fabric_metadata_t._spgw_skip_spgw31", 1, false],
+        ["fabric_metadata_t._spgw_notify_spgwc32", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_encap33", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_decap34", 1, false],
+        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr35", 1, false],
+        ["fabric_metadata_t._bng_type36", 2, false],
+        ["fabric_metadata_t._bng_line_id37", 32, false],
+        ["fabric_metadata_t._bng_pppoe_session_id38", 16, false],
+        ["fabric_metadata_t._bng_ds_meter_result39", 32, false],
+        ["fabric_metadata_t._bng_s_tag40", 12, false],
+        ["fabric_metadata_t._bng_c_tag41", 12, false],
+        ["fabric_metadata_t._int_meta_source42", 1, false],
+        ["fabric_metadata_t._int_meta_transit43", 1, false],
+        ["fabric_metadata_t._int_meta_sink44", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id45", 32, false],
+        ["fabric_metadata_t._int_meta_new_words46", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes47", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp48", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp49", 32, false],
+        ["_padding_0", 2, false]
       ]
     },
     {
@@ -802,7 +799,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -840,7 +837,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -861,7 +858,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_s_tag40"]
                 },
                 {
                   "type" : "field",
@@ -874,7 +871,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -900,7 +897,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -921,7 +918,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
+                  "value" : ["scalars", "fabric_metadata_t._bng_c_tag41"]
                 },
                 {
                   "type" : "field",
@@ -1087,7 +1084,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -1119,7 +1116,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -2018,11 +2015,11 @@
       "is_direct" : false
     },
     {
-      "name" : "FabricIngress.spgw_ingress.pdr_counter",
+      "name" : "FabricIngress.spgw.pdr_counter",
       "id" : 19,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 180,
+        "line" : 109,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2066,11 +2063,11 @@
       }
     },
     {
-      "name" : "FabricEgress.spgw_egress.pdr_counter",
+      "name" : "FabricEgress.spgw.pdr_counter",
       "id" : 23,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 301,
+        "line" : 286,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2146,7 +2143,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -2345,16 +2342,28 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "name" : "NoAction",
       "id" : 13,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 14,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "id" : 15,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source44"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source42"]
             },
             {
               "type" : "expression",
@@ -2382,7 +2391,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_sink",
-      "id" : 14,
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2390,7 +2399,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
             },
             {
               "type" : "expression",
@@ -2418,7 +2427,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
-      "id" : 15,
+      "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2468,7 +2477,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2482,7 +2491,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
-      "id" : 16,
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2490,7 +2499,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2499,7 +2508,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 161,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2523,7 +2532,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
-      "id" : 17,
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2531,7 +2540,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2540,7 +2549,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 161,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2564,7 +2573,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
-      "id" : 18,
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2581,7 +2590,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2610,7 +2619,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2624,7 +2633,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v6",
-      "id" : 19,
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2641,7 +2650,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 119,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -2670,7 +2679,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2684,7 +2693,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.set_session",
-      "id" : 20,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "pppoe_session_id",
@@ -2697,7 +2706,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2706,7 +2715,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2716,7 +2725,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
             },
             {
               "type" : "runtime_data",
@@ -2739,7 +2748,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2753,7 +2762,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.drop",
-      "id" : 21,
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2761,7 +2770,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -2770,7 +2779,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 163,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2784,7 +2793,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -2813,31 +2822,31 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
-      "id" : 22,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
-      "id" : 23,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
       "id" : 24,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
+      "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
       "id" : 25,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.bng_ingress.set_line",
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
       "id" : 26,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
+      "id" : 27,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.set_line",
+      "id" : 28,
       "runtime_data" : [
         {
           "name" : "line_id",
@@ -2850,7 +2859,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "runtime_data",
@@ -2868,7 +2877,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 27,
+      "id" : 29,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2933,13 +2942,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 28,
+      "id" : 30,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 29,
+      "id" : 31,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -2970,7 +2979,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 30,
+      "id" : 32,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -3001,7 +3010,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 31,
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3032,7 +3041,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 32,
+      "id" : 34,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3082,43 +3091,6 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 30,
-            "column" : 32,
-            "source_fragment" : "= next_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 34,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
       "id" : 35,
       "runtime_data" : [
         {
@@ -3149,8 +3121,45 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.set_next_id_acl",
+      "name" : "FabricIngress.forwarding.nop_routing_v4",
       "id" : 36,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
+      "id" : 37,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.set_next_id_acl",
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3181,7 +3190,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 37,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3236,7 +3245,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 38,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -3267,7 +3276,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 39,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3318,13 +3327,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 40,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 41,
+      "id" : 43,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -3355,7 +3364,7 @@
     },
     {
       "name" : "FabricIngress.next.set_double_vlan",
-      "id" : 42,
+      "id" : 44,
       "runtime_data" : [
         {
           "name" : "outer_vlan_id",
@@ -3439,7 +3448,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_s_tag42"]
+              "value" : ["scalars", "fabric_metadata_t._bng_s_tag40"]
             },
             {
               "type" : "runtime_data",
@@ -3458,7 +3467,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_c_tag43"]
+              "value" : ["scalars", "fabric_metadata_t._bng_c_tag41"]
             },
             {
               "type" : "runtime_data",
@@ -3476,68 +3485,6 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 43,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 31,
-            "column" : 5,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 44,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id13"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 115,
-            "column" : 32,
-            "source_fragment" : "= next_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_simple",
       "id" : 45,
       "runtime_data" : [
         {
@@ -3568,10 +3515,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.routing_simple",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
       "id" : 46,
       "runtime_data" : [
         {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 115,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_simple",
+      "id" : 47,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.routing_simple",
+      "id" : 48,
+      "runtime_data" : [
+        {
           "name" : "port_num",
           "bitwidth" : 9
         },
@@ -3646,7 +3655,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_simple",
-      "id" : 47,
+      "id" : 49,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3746,7 +3755,7 @@
     },
     {
       "name" : "FabricIngress.next.output_hashed",
-      "id" : 48,
+      "id" : 50,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3777,7 +3786,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_hashed",
-      "id" : 49,
+      "id" : 51,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3854,7 +3863,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 50,
+      "id" : 52,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3954,7 +3963,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 51,
+      "id" : 53,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -4013,20 +4022,1666 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_source_iface",
-      "id" : 52,
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
+      "id" : 54,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp",
+      "id" : 55,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "id" : 56,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_tcp",
+      "id" : 58,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_udp",
+      "id" : 59,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_icmp",
+      "id" : 60,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_unknown",
+      "id" : 61,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_iface",
+      "id" : 62,
       "runtime_data" : [
         {
           "name" : "src_iface",
           "bitwidth" : 8
-        },
-        {
-          "name" : "direction",
-          "bitwidth" : 2
-        },
-        {
-          "name" : "skip_spgw",
-          "bitwidth" : 1
         }
       ],
       "primitives" : [
@@ -4035,7 +5690,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface31"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
             },
             {
               "type" : "runtime_data",
@@ -4044,7 +5699,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 50,
+            "line" : 121,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -4054,26 +5709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction23"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 51,
-            "column" : 33,
-            "source_fragment" : "= direction; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw32"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
             },
             {
               "type" : "expression",
@@ -4083,18 +5719,8 @@
                   "op" : "b2d",
                   "left" : null,
                   "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 2
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
+                    "type" : "bool",
+                    "value" : false
                   }
                 }
               }
@@ -4102,16 +5728,71 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 52,
+            "line" : 122,
             "column" : 33,
-            "source_fragment" : "= (bool)skip_spgw; ..."
+            "source_fragment" : "= false; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 53,
+      "name" : "FabricIngress.spgw.iface_miss",
+      "id" : 63,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 44,
+            "source_fragment" : "8w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 126,
+            "column" : 33,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 64,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -4132,36 +5813,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit33"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -4170,7 +5822,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4180,7 +5832,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id30"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -4189,7 +5841,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4199,7 +5851,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -4228,7 +5880,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4236,8 +5888,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 54,
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 65,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -4258,36 +5910,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit33"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             },
             {
               "type" : "runtime_data",
@@ -4296,7 +5919,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -4306,7 +5929,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id30"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id29"]
             },
             {
               "type" : "runtime_data",
@@ -4315,7 +5938,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -4325,7 +5948,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
             },
             {
               "type" : "expression",
@@ -4354,7 +5977,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -4362,8 +5985,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 55,
+      "name" : "FabricIngress.spgw.load_normal_far",
+      "id" : 66,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -4380,7 +6003,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -4409,8 +6032,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 138,
-            "column" : 35,
+            "line" : 186,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -4419,7 +6042,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc35"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 187,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
             },
             {
               "type" : "expression",
@@ -4448,7 +6110,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 139,
+            "line" : 188,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4456,8 +6118,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 56,
+      "name" : "FabricIngress.spgw.load_tunnel_far",
+      "id" : 67,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -4490,7 +6152,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -4519,8 +6181,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 148,
-            "column" : 35,
+            "line" : 197,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -4529,7 +6191,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc35"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
             },
             {
               "type" : "expression",
@@ -4558,7 +6259,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 149,
+            "line" : 199,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -4568,7 +6269,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap36"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
             },
             {
               "type" : "expression",
@@ -4587,7 +6288,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 201,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -4597,7 +6298,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
             },
             {
               "type" : "runtime_data",
@@ -4606,7 +6307,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 202,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -4616,7 +6317,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
             },
             {
               "type" : "runtime_data",
@@ -4625,7 +6326,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 203,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4635,7 +6336,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
             },
             {
               "type" : "runtime_data",
@@ -4644,7 +6345,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 204,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4654,7 +6355,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr28"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
             },
             {
               "type" : "runtime_data",
@@ -4663,7 +6364,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 205,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4682,7 +6383,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 207,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -4701,7 +6402,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 158,
+            "line" : 208,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -4720,7 +6421,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 209,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -4739,7 +6440,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 210,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -4747,27 +6448,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
-      "id" : 57,
-      "runtime_data" : [],
+      "name" : "FabricIngress.spgw.load_dbuf_far",
+      "id" : 68,
+      "runtime_data" : [
+        {
+          "name" : "drop",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "notify_cp",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "tunnel_src_port",
+          "bitwidth" : 16
+        },
+        {
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "teid",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 197,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -4775,18 +6521,38 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -4794,199 +6560,67 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc32"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 199,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
           }
         },
         {
-          "op" : "assign_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "tcp"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
             },
             {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 200,
-            "column" : 8,
-            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 201,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_tcp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_udp",
-      "id" : 58,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -4994,18 +6628,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "runtime_data",
+              "value" : 5
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 202,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -5013,18 +6647,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "line" : 203,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -5032,18 +6666,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "line" : 204,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -5051,165 +6685,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_udp"
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 205,
-            "column" : 8,
-            "source_fragment" : "hdr.udp = hdr.inner_udp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 206,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_udp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_icmp",
-      "id" : 59,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -5220,15 +6707,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
+            "line" : 207,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -5239,15 +6726,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 208,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -5258,15 +6745,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 209,
             "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -5277,158 +6764,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "hexstr",
+              "value" : "0x0868"
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 210,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "icmp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 211,
-            "column" : 8,
-            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 212,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_icmp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_unknown",
-      "id" : 60,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
             "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "source_fragment" : "= 2152; ..."
           }
         },
         {
@@ -5436,146 +6780,35 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr35"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr20"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport21"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport22"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 216,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "line" : 221,
+            "column" : 43,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 61,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5655,7 +6888,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 62,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5663,7 +6896,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
+              "value" : ["scalars", "spgw_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 71,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_tmp"]
             },
             {
               "type" : "expression",
@@ -5684,44 +6947,8 @@
       ]
     },
     {
-      "name" : "act_1",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_2",
-      "id" : 64,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5729,17 +6956,17 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricIngress.spgw_ingress.pdr_counter"
+              "value" : "FabricIngress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
+            "line" : 256,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -5747,7 +6974,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 65,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5755,72 +6982,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 281,
-            "column" : 32,
-            "source_fragment" : "= true; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 66,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
             },
             {
               "type" : "field",
@@ -5829,16 +6991,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 273,
+            "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 67,
+      "name" : "act_4",
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5901,8 +7063,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 68,
+      "name" : "act_5",
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5965,8 +7127,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 69,
+      "name" : "act_6",
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5991,8 +7153,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 70,
+      "name" : "act_7",
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6000,7 +7162,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -6036,7 +7198,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
@@ -6049,8 +7211,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 71,
+      "name" : "act_8",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6107,8 +7269,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 72,
+      "name" : "act_9",
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6133,8 +7295,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 73,
+      "name" : "act_10",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6163,8 +7325,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 74,
+      "name" : "act_11",
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6193,8 +7355,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 75,
+      "name" : "act_12",
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6202,7 +7364,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type36"]
             },
             {
               "type" : "hexstr",
@@ -6211,7 +7373,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 164,
+            "line" : 162,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -6242,8 +7404,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 76,
+      "name" : "act_13",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6278,8 +7440,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 77,
+      "name" : "act_14",
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6291,7 +7453,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6304,8 +7466,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 78,
+      "name" : "act_15",
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6317,7 +7479,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6330,8 +7492,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 79,
+      "name" : "act_16",
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6389,8 +7551,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 80,
+      "name" : "act_17",
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6419,8 +7581,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 81,
+      "name" : "act_18",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6449,8 +7611,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 82,
+      "name" : "act_19",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6462,11 +7624,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6479,8 +7641,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 83,
+      "name" : "act_20",
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6492,11 +7654,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6509,8 +7671,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 84,
+      "name" : "act_21",
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6522,11 +7684,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6539,8 +7701,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 85,
+      "name" : "act_22",
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6552,11 +7714,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result41"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result39"]
             }
           ],
           "source_info" : {
@@ -6570,43 +7732,43 @@
     },
     {
       "name" : "nop",
-      "id" : 86,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 87,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 88,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 89,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 90,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 91,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v4",
-      "id" : 92,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6623,7 +7785,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 122,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6709,7 +7871,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
             }
           ],
           "source_info" : {
@@ -6728,7 +7890,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6794,7 +7956,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 134,
+            "line" : 124,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -6803,7 +7965,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v6",
-      "id" : 93,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6820,7 +7982,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 122,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6906,7 +8068,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id40"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id38"]
             }
           ],
           "source_info" : {
@@ -6925,7 +8087,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id39"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id37"]
             }
           ],
           "source_info" : {
@@ -6991,7 +8153,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 125,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -7000,7 +8162,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 94,
+      "id" : 101,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -7068,7 +8230,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 155,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -7486,7 +8648,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 161,
+            "line" : 151,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -7495,7 +8657,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 95,
+      "id" : 102,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -7508,7 +8670,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit45"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit43"]
             },
             {
               "type" : "expression",
@@ -7537,7 +8699,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             },
             {
               "type" : "runtime_data",
@@ -7555,13 +8717,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 96,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 97,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7635,7 +8797,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -7649,7 +8811,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7677,7 +8839,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -7691,7 +8853,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7718,7 +8880,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 98,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7760,7 +8922,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -7774,7 +8936,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7802,7 +8964,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -7816,7 +8978,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7843,7 +9005,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 99,
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7951,7 +9113,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -7965,7 +9127,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7993,7 +9155,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8007,7 +9169,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8034,7 +9196,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 100,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8121,7 +9283,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8135,7 +9297,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8163,7 +9325,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8177,7 +9339,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8204,7 +9366,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 101,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8357,7 +9519,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8371,7 +9533,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8399,7 +9561,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8413,7 +9575,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8440,7 +9602,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 102,
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8561,7 +9723,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8575,7 +9737,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8603,7 +9765,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8617,7 +9779,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8644,7 +9806,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 103,
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8831,7 +9993,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8845,7 +10007,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8873,7 +10035,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -8887,7 +10049,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8914,7 +10076,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 104,
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8941,7 +10103,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -8956,7 +10118,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -8970,7 +10132,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8998,7 +10160,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9012,7 +10174,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9039,7 +10201,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 105,
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9132,7 +10294,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9147,7 +10309,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9161,7 +10323,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9189,7 +10351,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9203,7 +10365,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9230,7 +10392,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 106,
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9291,7 +10453,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9306,7 +10468,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9320,7 +10482,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9348,7 +10510,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9362,7 +10524,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9389,7 +10551,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 107,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9516,7 +10678,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9531,7 +10693,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9545,7 +10707,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9573,7 +10735,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9587,7 +10749,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9614,7 +10776,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 108,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9720,7 +10882,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -9735,7 +10897,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -9749,7 +10911,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9777,7 +10939,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -9791,7 +10953,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9818,7 +10980,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 109,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9990,7 +11152,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -10005,7 +11167,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10019,7 +11181,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10047,7 +11209,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10061,7 +11223,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10088,7 +11250,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 110,
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10228,7 +11390,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -10243,7 +11405,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10257,7 +11419,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10285,7 +11447,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10299,7 +11461,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10326,7 +11488,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 111,
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10532,7 +11694,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id47"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id45"]
             }
           ],
           "source_info" : {
@@ -10547,7 +11709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10561,7 +11723,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10589,7 +11751,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10603,7 +11765,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10630,13 +11792,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 112,
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 113,
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10678,7 +11840,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10692,7 +11854,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10720,7 +11882,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10734,7 +11896,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10761,7 +11923,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 114,
+      "id" : 121,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10822,7 +11984,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -10836,7 +11998,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10864,7 +12026,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -10878,7 +12040,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10905,7 +12067,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 115,
+      "id" : 122,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11000,7 +12162,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11014,7 +12176,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11042,7 +12204,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11056,7 +12218,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11083,7 +12245,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 116,
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11148,7 +12310,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11162,7 +12324,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11190,7 +12352,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11204,7 +12366,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11231,7 +12393,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 117,
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11330,7 +12492,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11344,7 +12506,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11372,7 +12534,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11386,7 +12548,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11413,7 +12575,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 118,
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11531,7 +12693,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11545,7 +12707,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11573,7 +12735,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11587,7 +12749,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11614,7 +12776,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 119,
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11766,7 +12928,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11780,7 +12942,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11808,7 +12970,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11822,7 +12984,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11849,7 +13011,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 120,
+      "id" : 127,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11891,7 +13053,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -11905,7 +13067,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11933,7 +13095,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -11947,7 +13109,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11974,7 +13136,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 121,
+      "id" : 128,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12050,7 +13212,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12064,7 +13226,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12092,7 +13254,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12106,7 +13268,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12133,7 +13295,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 122,
+      "id" : 129,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12228,7 +13390,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12242,7 +13404,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12270,7 +13432,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12284,7 +13446,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12311,7 +13473,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 123,
+      "id" : 130,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12440,7 +13602,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12454,7 +13616,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12482,7 +13644,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12496,7 +13658,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12523,7 +13685,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 124,
+      "id" : 131,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12622,7 +13784,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12636,7 +13798,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12664,7 +13826,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12678,7 +13840,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12705,7 +13867,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 125,
+      "id" : 132,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12838,7 +14000,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -12852,7 +14014,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12880,7 +14042,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -12894,7 +14056,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12921,7 +14083,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 126,
+      "id" : 133,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13073,7 +14235,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -13087,7 +14249,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13115,7 +14277,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -13129,7 +14291,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13156,7 +14318,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 127,
+      "id" : 134,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13342,7 +14504,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
             },
             {
               "type" : "expression",
@@ -13356,7 +14518,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13384,7 +14546,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
             },
             {
               "type" : "expression",
@@ -13398,7 +14560,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13425,7 +14587,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 128,
+      "id" : 135,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -13531,7 +14693,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 128,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -13759,7 +14921,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 130,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -13945,7 +15107,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 171,
+            "line" : 161,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -14040,7 +15202,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 175,
+            "line" : 165,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -14087,7 +15249,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 129,
+      "id" : 136,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14132,7 +15294,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 130,
+      "id" : 137,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14463,7 +15625,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 131,
+      "id" : 138,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14504,7 +15666,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 132,
+      "id" : 139,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14612,7 +15774,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 116,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -14621,7 +15783,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 133,
+      "id" : 140,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14691,7 +15853,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14719,7 +15881,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 134,
+      "id" : 141,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14789,7 +15951,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14817,7 +15979,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_inner_vlan",
-      "id" : 135,
+      "id" : 142,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14906,7 +16068,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14925,7 +16087,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -14934,7 +16096,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 136,
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14955,8 +16117,8 @@
       ]
     },
     {
-      "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 137,
+      "name" : "FabricEgress.spgw.gtpu_encap",
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14969,7 +16131,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 291,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -14988,7 +16150,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 292,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -15007,7 +16169,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 133,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -15026,7 +16188,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 294,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -15045,7 +16207,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 295,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -15087,7 +16249,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 296,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -15106,7 +16268,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 298,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -15125,7 +16287,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 299,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -15144,7 +16306,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 300,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -15163,7 +16325,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 146,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -15182,7 +16344,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 130,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -15196,12 +16358,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr26"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 303,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -15215,12 +16377,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr28"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr27"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 304,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -15239,7 +16401,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 305,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -15254,7 +16416,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -15268,12 +16430,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port25"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 323,
+            "line" : 308,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -15292,7 +16454,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -15316,7 +16478,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -15334,7 +16496,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 310,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -15353,7 +16515,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -15368,7 +16530,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -15387,7 +16549,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -15406,7 +16568,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -15425,7 +16587,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -15444,7 +16606,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -15463,7 +16625,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -15482,7 +16644,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -15501,7 +16663,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -15515,12 +16677,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len23"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -15534,12 +16696,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -15547,8 +16709,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 138,
+      "name" : "act_23",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15564,8 +16726,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 139,
+      "name" : "act_24",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15615,8 +16777,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 140,
+      "name" : "act_25",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15637,8 +16799,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 141,
+      "name" : "act_26",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15667,8 +16829,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 142,
+      "name" : "act_27",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15697,8 +16859,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 143,
+      "name" : "act_28",
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15719,8 +16881,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 144,
+      "name" : "act_29",
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15741,8 +16903,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 145,
+      "name" : "act_30",
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15790,8 +16952,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 146,
+      "name" : "act_31",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15812,8 +16974,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 147,
+      "name" : "act_32",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15861,8 +17023,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 148,
+      "name" : "act_33",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15883,8 +17045,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 149,
+      "name" : "act_34",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15932,74 +17094,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 150,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_37",
-      "id" : 151,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_38",
-      "id" : 152,
+      "name" : "act_35",
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16007,25 +17103,25 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricEgress.spgw_egress.pdr_counter"
+              "value" : "FabricEgress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id29"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id28"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
+            "line" : 333,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
       ]
     },
     {
-      "name" : "act_39",
-      "id" : 153,
+      "name" : "act_36",
+      "id" : 158,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16054,8 +17150,8 @@
       ]
     },
     {
-      "name" : "act_40",
-      "id" : 154,
+      "name" : "act_37",
+      "id" : 159,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16090,8 +17186,8 @@
       ]
     },
     {
-      "name" : "act_41",
-      "id" : 155,
+      "name" : "act_38",
+      "id" : 160,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16117,7 +17213,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       }
                     }
                   },
@@ -16139,8 +17235,8 @@
       ]
     },
     {
-      "name" : "act_42",
-      "id" : 156,
+      "name" : "act_39",
+      "id" : 161,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16188,8 +17284,8 @@
       ]
     },
     {
-      "name" : "act_43",
-      "id" : 157,
+      "name" : "act_40",
+      "id" : 162,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16215,7 +17311,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes49"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes47"]
                       }
                     }
                   },
@@ -16237,8 +17333,8 @@
       ]
     },
     {
-      "name" : "act_44",
-      "id" : 158,
+      "name" : "act_41",
+      "id" : 163,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16264,7 +17360,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words48"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words46"]
                       }
                     }
                   },
@@ -16314,50 +17410,27 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
+          "action_ids" : [69],
           "actions" : ["act"],
-          "base_default_next" : "tbl_act_0",
+          "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
-            "act" : "tbl_act_0"
+            "act" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 69,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_0",
+          "name" : "FabricIngress.spgw.interfaces",
           "id" : 1,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_0"],
-          "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
-          "next_tables" : {
-            "act_0" : "FabricIngress.spgw_ingress.interface_lookup"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.interface_lookup",
-          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 55,
+            "line" : 130,
             "column" : 10,
-            "source_fragment" : "interface_lookup"
+            "source_fragment" : "interfaces"
           },
           "key" : [
             {
@@ -16379,40 +17452,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
-          "base_default_next" : "node_6",
+          "action_ids" : [62, 63],
+          "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.spgw_ingress.set_source_iface" : "node_6"
-          },
-          "default_entry" : {
-            "action_id" : 52,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x1"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_8",
-          "next_tables" : {
-            "act_1" : "node_8"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
             "action_id" : 63,
@@ -16422,92 +17467,8 @@
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "id" : 4,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 93,
-            "column" : 10,
-            "source_fragment" : "uplink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "teid",
-              "target" : ["gtpu", "teid"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 54,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 82,
-            "column" : 10,
-            "source_fragment" : "downlink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 53,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_2",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
+          "name" : "tbl_act_0",
+          "id" : 2,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16515,25 +17476,48 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_13",
+          "action_ids" : [70],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "act_2" : "node_13"
+            "act_0" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 70,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "id" : 7,
+          "name" : "tbl_act_1",
+          "id" : 3,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [71],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 71,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 75,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -16563,17 +17547,17 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57, 58, 59, 60],
-          "actions" : ["FabricIngress.spgw_ingress.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_inner_udp", "FabricIngress.spgw_ingress.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_inner_unknown"],
-          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "action_ids" : [54, 55, 56, 57],
+          "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16582,7 +17566,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 233,
+                "line" : 89,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -16601,7 +17585,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 57,
+                "action_id" : 54,
                 "action_data" : []
               },
               "priority" : 1
@@ -16609,7 +17593,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 234,
+                "line" : 90,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -16628,7 +17612,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 58,
+                "action_id" : 55,
                 "action_data" : []
               },
               "priority" : 2
@@ -16636,7 +17620,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 91,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -16655,7 +17639,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 56,
                 "action_data" : []
               },
               "priority" : 3
@@ -16663,19 +17647,262 @@
           ]
         },
         {
-          "name" : "FabricIngress.spgw_ingress.far_lookup",
+          "name" : "FabricIngress.spgw.uplink_pdrs",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 168,
+            "column" : 10,
+            "source_fragment" : "uplink_pdrs"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "teid",
+              "target" : ["gtpu", "teid"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [65, 14],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 14,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.downlink_pdrs",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 157,
+            "column" : 10,
+            "source_fragment" : "downlink_pdrs"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [64, 13],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 13,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 256,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [72],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_15",
+          "next_tables" : {
+            "act_2" : "node_15"
+          },
+          "default_entry" : {
+            "action_id" : 72,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 163,
+            "line" : 75,
             "column" : 10,
-            "source_fragment" : "far_lookup"
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [58, 59, 60, 61],
+          "actions" : ["FabricIngress.spgw.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu.decap_inner_udp", "FabricIngress.spgw.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu.decap_inner_unknown"],
+          "base_default_next" : "FabricIngress.spgw.fars",
+          "next_tables" : {
+            "FabricIngress.spgw.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw.fars"
+          },
+          "default_entry" : {
+            "action_id" : 61,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 89,
+                "column" : 12,
+                "source_fragment" : "(true, false, false) : decap_inner_tcp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 58,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 90,
+                "column" : 12,
+                "source_fragment" : "(false, true, false) : decap_inner_udp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 59,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "column" : 12,
+                "source_fragment" : "(false, false, true) : decap_inner_icmp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 60,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw.fars",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 224,
+            "column" : 10,
+            "source_fragment" : "fars"
           },
           "key" : [
             {
               "match_type" : "exact",
               "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id30"],
+              "target" : ["scalars", "fabric_metadata_t._spgw_far_id29"],
               "mask" : null
             }
           ],
@@ -16685,56 +17912,28 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55, 56],
-          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
-          "base_default_next" : "node_16",
+          "action_ids" : [66, 67, 68],
+          "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
+          "base_default_next" : "tbl_act_3",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_16",
-            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_16"
+            "FabricIngress.spgw.load_normal_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 66,
             "action_const" : true,
-            "action_data" : ["0x1", "0x1"],
+            "action_data" : ["0x1", "0x0"],
             "action_entry_const" : true
           }
         },
         {
           "name" : "tbl_act_3",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_3"],
-          "base_default_next" : "tbl_act_4",
-          "next_tables" : {
-            "act_3" : "tbl_act_4"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_4",
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 273,
+            "column" : 36,
             "source_fragment" : "="
           },
           "key" : [],
@@ -16744,21 +17943,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_4"],
+          "action_ids" : [73],
+          "actions" : ["act_3"],
           "base_default_next" : "node_19",
           "next_tables" : {
-            "act_4" : "node_19"
+            "act_3" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 66,
+            "action_id" : 73,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_4",
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -16773,21 +17972,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_5"],
+          "action_ids" : [74],
+          "actions" : ["act_4"],
           "base_default_next" : "node_21",
           "next_tables" : {
-            "act_5" : "node_21"
+            "act_4" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 67,
+            "action_id" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_act_5",
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -16802,21 +18001,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_6"],
+          "action_ids" : [75],
+          "actions" : ["act_5"],
           "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_23"
+            "act_5" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 75,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_act_6",
           "id" : 13,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -16831,14 +18030,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [69],
-          "actions" : ["act_7"],
+          "action_ids" : [76],
+          "actions" : ["act_6"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_7" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 69,
+            "action_id" : 76,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16885,7 +18084,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27, 28, 29],
+          "action_ids" : [29, 30, 31],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -16894,7 +18093,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 27,
+            "action_id" : 29,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16941,14 +18140,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [30],
+          "action_ids" : [32],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_27",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 30,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -16983,7 +18182,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31, 4],
+          "action_ids" : [33, 4],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17020,7 +18219,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 5],
+          "action_ids" : [34, 5],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17057,7 +18256,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33, 34, 6],
+          "action_ids" : [35, 36, 6],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17095,7 +18294,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35, 7],
+          "action_ids" : [37, 7],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -17198,7 +18397,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36, 37, 38, 39, 40],
+          "action_ids" : [38, 39, 40, 41, 42],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_37",
           "next_tables" : {
@@ -17209,7 +18408,7 @@
             "FabricIngress.acl.nop_acl" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17244,7 +18443,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43, 44, 9],
+          "action_ids" : [45, 46, 9],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -17282,7 +18481,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45, 46, 47, 10],
+          "action_ids" : [47, 48, 49, 10],
           "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -17322,7 +18521,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48, 49, 50, 11],
+          "action_ids" : [50, 51, 52, 11],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -17355,7 +18554,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51, 12],
+          "action_ids" : [53, 12],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -17392,7 +18591,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41, 42, 8],
+          "action_ids" : [43, 44, 8],
           "actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
           "base_default_next" : "node_43",
           "next_tables" : {
@@ -17408,7 +18607,7 @@
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_act_7",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -17423,21 +18622,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70],
-          "actions" : ["act_8"],
+          "action_ids" : [77],
+          "actions" : ["act_7"],
           "base_default_next" : "node_45",
           "next_tables" : {
-            "act_8" : "node_45"
+            "act_7" : "node_45"
           },
           "default_entry" : {
-            "action_id" : 70,
+            "action_id" : 77,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_act_8",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -17452,14 +18651,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["act_9"],
+          "action_ids" : [78],
+          "actions" : ["act_8"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_9" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_8" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 71,
+            "action_id" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17488,7 +18687,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 0],
+          "action_ids" : [15, 0],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
@@ -17525,7 +18724,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 1],
+          "action_ids" : [16, 1],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
           "base_default_next" : "node_49",
           "next_tables" : {
@@ -17540,7 +18739,7 @@
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_act_9",
           "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -17555,14 +18754,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_10"],
+          "action_ids" : [79],
+          "actions" : ["act_9"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
-            "act_10" : "FabricIngress.bng_ingress.t_line_map"
+            "act_9" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
-            "action_id" : 72,
+            "action_id" : 79,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17581,13 +18780,13 @@
             {
               "match_type" : "exact",
               "name" : "s_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_s_tag42"],
+              "target" : ["scalars", "fabric_metadata_t._bng_s_tag40"],
               "mask" : null
             },
             {
               "match_type" : "exact",
               "name" : "c_tag",
-              "target" : ["scalars", "fabric_metadata_t._bng_c_tag43"],
+              "target" : ["scalars", "fabric_metadata_t._bng_c_tag41"],
               "mask" : null
             }
           ],
@@ -17597,21 +18796,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [26],
+          "action_ids" : [28],
           "actions" : ["FabricIngress.bng_ingress.set_line"],
           "base_default_next" : "node_52",
           "next_tables" : {
             "FabricIngress.bng_ingress.set_line" : "node_52"
           },
           "default_entry" : {
-            "action_id" : 26,
+            "action_id" : 28,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act_10",
           "id" : 32,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17626,14 +18825,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["act_13"],
+          "action_ids" : [82],
+          "actions" : ["act_12"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
           "next_tables" : {
-            "act_13" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+            "act_12" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
           },
           "default_entry" : {
-            "action_id" : 75,
+            "action_id" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17668,12 +18867,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 2],
+          "action_ids" : [17, 2],
           "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_12",
-            "__MISS__" : "tbl_act_13"
+            "__HIT__" : "tbl_act_11",
+            "__MISS__" : "tbl_act_12"
           },
           "default_entry" : {
             "action_id" : 2,
@@ -17683,7 +18882,7 @@
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_act_11",
           "id" : 34,
           "key" : [],
           "match_type" : "exact",
@@ -17692,21 +18891,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_11"],
+          "action_ids" : [80],
+          "actions" : ["act_10"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_11" : "node_57"
+            "act_10" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 73,
+            "action_id" : 80,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
+          "name" : "tbl_act_12",
           "id" : 35,
           "key" : [],
           "match_type" : "exact",
@@ -17715,21 +18914,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_12"],
+          "action_ids" : [81],
+          "actions" : ["act_11"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_12" : "node_57"
+            "act_11" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 74,
+            "action_id" : 81,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
+          "name" : "tbl_act_13",
           "id" : 36,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17744,14 +18943,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["act_14"],
+          "action_ids" : [83],
+          "actions" : ["act_13"],
           "base_default_next" : "node_59",
           "next_tables" : {
-            "act_14" : "node_59"
+            "act_13" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 83,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17770,7 +18969,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -17792,22 +18991,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 16],
+          "action_ids" : [20, 18],
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_15",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_14",
             "FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
           },
           "default_entry" : {
-            "action_id" : 16,
+            "action_id" : 18,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_act_14",
           "id" : 38,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17822,21 +19021,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77],
-          "actions" : ["act_15"],
+          "action_ids" : [84],
+          "actions" : ["act_14"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "act_14" : null
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_act_15",
           "id" : 39,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17851,14 +19050,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79],
-          "actions" : ["act_17"],
+          "action_ids" : [86],
+          "actions" : ["act_16"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
           "next_tables" : {
-            "act_17" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+            "act_16" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17877,7 +19076,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -17899,22 +19098,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 17],
+          "action_ids" : [21, 19],
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v6", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_17",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_16",
             "FabricIngress.bng_ingress.upstream.term_enabled_v6" : null
           },
           "default_entry" : {
-            "action_id" : 17,
+            "action_id" : 19,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_16",
           "id" : 41,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -17929,14 +19128,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [78],
-          "actions" : ["act_16"],
+          "action_ids" : [85],
+          "actions" : ["act_15"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_16" : null
+            "act_15" : null
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17955,7 +19154,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             }
           ],
@@ -17965,12 +19164,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [3, 20, 21],
+          "action_ids" : [3, 22, 23],
           "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_18",
-            "__MISS__" : "tbl_act_19"
+            "__HIT__" : "tbl_act_17",
+            "__MISS__" : "tbl_act_18"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -17980,7 +19179,7 @@
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "tbl_act_17",
           "id" : 43,
           "key" : [],
           "match_type" : "exact",
@@ -17989,21 +19188,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [80],
-          "actions" : ["act_18"],
+          "action_ids" : [87],
+          "actions" : ["act_17"],
           "base_default_next" : "node_70",
           "next_tables" : {
-            "act_18" : "node_70"
+            "act_17" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 80,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
+          "name" : "tbl_act_18",
           "id" : 44,
           "key" : [],
           "match_type" : "exact",
@@ -18012,14 +19211,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["act_19"],
+          "action_ids" : [88],
+          "actions" : ["act_18"],
           "base_default_next" : "node_70",
           "next_tables" : {
-            "act_19" : "node_70"
+            "act_18" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 81,
+            "action_id" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18038,7 +19237,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -18066,22 +19265,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 24],
+          "action_ids" : [24, 26],
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_20",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_21"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_19",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_20"
           },
           "default_entry" : {
-            "action_id" : 24,
+            "action_id" : 26,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
+          "name" : "tbl_act_19",
           "id" : 46,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18096,21 +19295,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["act_20"],
+          "action_ids" : [89],
+          "actions" : ["act_19"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_20" : null
+            "act_19" : null
           },
           "default_entry" : {
-            "action_id" : 82,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
+          "name" : "tbl_act_20",
           "id" : 47,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18125,14 +19324,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["act_21"],
+          "action_ids" : [90],
+          "actions" : ["act_20"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_21" : null
+            "act_20" : null
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18151,7 +19350,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id39"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id37"],
               "mask" : null
             },
             {
@@ -18173,22 +19372,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 25],
+          "action_ids" : [25, 27],
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_22",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_23"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_21",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_22"
           },
           "default_entry" : {
-            "action_id" : 25,
+            "action_id" : 27,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
+          "name" : "tbl_act_21",
           "id" : 49,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18203,21 +19402,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
-          "actions" : ["act_22"],
+          "action_ids" : [91],
+          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_22" : null
+            "act_21" : null
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_23",
+          "name" : "tbl_act_22",
           "id" : 50,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -18232,14 +19431,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["act_23"],
+          "action_ids" : [92],
+          "actions" : ["act_22"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_23" : null
+            "act_22" : null
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18306,72 +19505,58 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "tbl_act_0"
+          "false_next" : "FabricIngress.spgw.interfaces"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "spgw_tmp"]
+              }
+            }
+          },
+          "true_next" : "node_8",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_8",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "line" : 246,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
               "op" : "==",
               "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw32"]
-                  }
-                }
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
               },
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "hexstr",
+                "value" : "0x03"
               }
             }
           },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_8"
+          "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "false_next" : "node_10"
         },
         {
-          "name" : "node_8",
-          "id" : 2,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_9",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_9",
+          "name" : "node_10",
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 253,
-            "column" : 12,
+            "line" : 250,
+            "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
           "expression" : {
@@ -18385,16 +19570,42 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "false_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+          "true_next" : "FabricIngress.spgw.uplink_pdrs",
+          "false_next" : "FabricIngress.spgw.downlink_pdrs"
         },
         {
           "name" : "node_13",
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
-            "column" : 12,
+            "line" : 255,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface30"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_15"
+        },
+        {
+          "name" : "node_15",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 260,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
           "expression" : {
@@ -18408,7 +19619,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap37"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap34"]
                   }
                 }
               },
@@ -18418,41 +19629,8 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "false_next" : "FabricIngress.spgw_ingress.far_lookup"
-        },
-        {
-          "name" : "node_16",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 277,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.far_dropped == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped34"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_3",
-          "false_next" : "tbl_act_4"
+          "true_next" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
+          "false_next" : "FabricIngress.spgw.fars"
         },
         {
           "name" : "node_19",
@@ -18474,7 +19652,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_act_4",
           "false_next" : "node_21"
         },
         {
@@ -18497,7 +19675,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_act_5",
           "false_next" : "node_23"
         },
         {
@@ -18527,7 +19705,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_act_6",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -18723,7 +19901,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
+          "true_next" : "tbl_act_7",
           "false_next" : "node_45"
         },
         {
@@ -18749,7 +19927,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_act_8",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
@@ -18772,7 +19950,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
                   }
                 }
               },
@@ -18782,7 +19960,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_act_9",
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
@@ -18805,7 +19983,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_10",
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
@@ -18822,7 +20000,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_13",
           "false_next" : "node_59"
         },
         {
@@ -18893,7 +20071,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_16"
+          "true_next" : "tbl_act_15"
         },
         {
           "name" : "node_70",
@@ -18972,7 +20150,7 @@
       "init_table" : "node_81",
       "tables" : [
         {
-          "name" : "tbl_act_24",
+          "name" : "tbl_act_23",
           "id" : 51,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -18987,21 +20165,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [138],
-          "actions" : ["act_24"],
+          "action_ids" : [145],
+          "actions" : ["act_23"],
           "base_default_next" : "node_83",
           "next_tables" : {
-            "act_24" : "node_83"
+            "act_23" : "node_83"
           },
           "default_entry" : {
-            "action_id" : 138,
+            "action_id" : 145,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
+          "name" : "tbl_act_24",
           "id" : 52,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -19016,21 +20194,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [139],
-          "actions" : ["act_25"],
+          "action_ids" : [146],
+          "actions" : ["act_24"],
           "base_default_next" : "node_85",
           "next_tables" : {
-            "act_25" : "node_85"
+            "act_24" : "node_85"
           },
           "default_entry" : {
-            "action_id" : 139,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
+          "name" : "tbl_act_25",
           "id" : 53,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19045,14 +20223,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [140],
-          "actions" : ["act_26"],
+          "action_ids" : [147],
+          "actions" : ["act_25"],
           "base_default_next" : "node_87",
           "next_tables" : {
-            "act_26" : "node_87"
+            "act_25" : "node_87"
           },
           "default_entry" : {
-            "action_id" : 140,
+            "action_id" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19074,14 +20252,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [131],
+          "action_ids" : [138],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "node_91",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "node_91"
           },
           "default_entry" : {
-            "action_id" : 131,
+            "action_id" : 138,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19103,14 +20281,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [132],
+          "action_ids" : [139],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "node_91",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "node_91"
           },
           "default_entry" : {
-            "action_id" : 132,
+            "action_id" : 139,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19132,14 +20310,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [133],
+          "action_ids" : [140],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "tbl_egress_next_push_inner_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "tbl_egress_next_push_inner_vlan"
           },
           "default_entry" : {
-            "action_id" : 133,
+            "action_id" : 140,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19161,21 +20339,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [135],
+          "action_ids" : [142],
           "actions" : ["FabricEgress.egress_next.push_inner_vlan"],
           "base_default_next" : "node_101",
           "next_tables" : {
             "FabricEgress.egress_next.push_inner_vlan" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 135,
+            "action_id" : 142,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
+          "name" : "tbl_act_26",
           "id" : 58,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19190,14 +20368,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [143],
-          "actions" : ["act_29"],
+          "action_ids" : [150],
+          "actions" : ["act_28"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
-            "act_29" : "FabricEgress.egress_next.egress_vlan"
+            "act_28" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 143,
+            "action_id" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19232,22 +20410,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [136, 89],
+          "action_ids" : [143, 96],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_28",
-            "__MISS__" : "tbl_act_29"
+            "__HIT__" : "tbl_act_27",
+            "__MISS__" : "tbl_act_28"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 96,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
+          "name" : "tbl_act_27",
           "id" : 60,
           "key" : [],
           "match_type" : "exact",
@@ -19256,21 +20434,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [141],
-          "actions" : ["act_27"],
+          "action_ids" : [148],
+          "actions" : ["act_26"],
           "base_default_next" : "node_98",
           "next_tables" : {
-            "act_27" : "node_98"
+            "act_26" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 141,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_29",
+          "name" : "tbl_act_28",
           "id" : 61,
           "key" : [],
           "match_type" : "exact",
@@ -19279,14 +20457,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [142],
-          "actions" : ["act_28"],
+          "action_ids" : [149],
+          "actions" : ["act_27"],
           "base_default_next" : "node_98",
           "next_tables" : {
-            "act_28" : "node_98"
+            "act_27" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 142,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19308,21 +20486,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [134],
+          "action_ids" : [141],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "node_101",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 134,
+            "action_id" : 141,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
+          "name" : "tbl_act_29",
           "id" : 63,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19337,21 +20515,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [145],
-          "actions" : ["act_31"],
+          "action_ids" : [152],
+          "actions" : ["act_30"],
           "base_default_next" : "node_103",
           "next_tables" : {
-            "act_31" : "node_103"
+            "act_30" : "node_103"
           },
           "default_entry" : {
-            "action_id" : 145,
+            "action_id" : 152,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
+          "name" : "tbl_act_30",
           "id" : 64,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19366,21 +20544,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [144],
-          "actions" : ["act_30"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [151],
+          "actions" : ["act_29"],
+          "base_default_next" : "node_113",
           "next_tables" : {
-            "act_30" : "tbl_act_36"
+            "act_29" : "node_113"
           },
           "default_entry" : {
-            "action_id" : 144,
+            "action_id" : 151,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
+          "name" : "tbl_act_31",
           "id" : 65,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19395,21 +20573,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
-          "actions" : ["act_33"],
+          "action_ids" : [154],
+          "actions" : ["act_32"],
           "base_default_next" : "node_107",
           "next_tables" : {
-            "act_33" : "node_107"
+            "act_32" : "node_107"
           },
           "default_entry" : {
-            "action_id" : 147,
+            "action_id" : 154,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
+          "name" : "tbl_act_32",
           "id" : 66,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19424,21 +20602,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [146],
-          "actions" : ["act_32"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [153],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_113",
           "next_tables" : {
-            "act_32" : "tbl_act_36"
+            "act_31" : "node_113"
           },
           "default_entry" : {
-            "action_id" : 146,
+            "action_id" : 153,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_34",
+          "name" : "tbl_act_33",
           "id" : 67,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19453,21 +20631,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149],
-          "actions" : ["act_35"],
+          "action_ids" : [156],
+          "actions" : ["act_34"],
           "base_default_next" : "node_111",
           "next_tables" : {
-            "act_35" : "node_111"
+            "act_34" : "node_111"
           },
           "default_entry" : {
-            "action_id" : 149,
+            "action_id" : 156,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_35",
+          "name" : "tbl_act_34",
           "id" : 68,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -19482,107 +20660,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
-          "actions" : ["act_34"],
-          "base_default_next" : "tbl_act_36",
+          "action_ids" : [155],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_113",
           "next_tables" : {
-            "act_34" : "tbl_act_36"
+            "act_33" : "node_113"
           },
           "default_entry" : {
-            "action_id" : 148,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_36",
+          "name" : "tbl_spgw_gtpu_encap",
           "id" : 69,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [151],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_114",
-          "next_tables" : {
-            "act_37" : "node_114"
-          },
-          "default_entry" : {
-            "action_id" : 151,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_37",
-          "id" : 70,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [150],
-          "actions" : ["act_36"],
-          "base_default_next" : "node_116",
-          "next_tables" : {
-            "act_36" : "node_116"
-          },
-          "default_entry" : {
-            "action_id" : 150,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_38",
-          "id" : 71,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [152],
-          "actions" : ["act_38"],
-          "base_default_next" : "node_118",
-          "next_tables" : {
-            "act_38" : "node_118"
-          },
-          "default_entry" : {
-            "action_id" : 152,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 72,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 347,
-            "column" : 12,
+            "line" : 330,
+            "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -19592,14 +20689,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [137],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_120",
+          "action_ids" : [144],
+          "actions" : ["FabricEgress.spgw.gtpu_encap"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_120"
+            "FabricEgress.spgw.gtpu_encap" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 137,
+            "action_id" : 144,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_35",
+          "id" : 70,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 333,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [157],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_118",
+          "next_tables" : {
+            "act_35" : "node_118"
+          },
+          "default_entry" : {
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19607,7 +20733,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 73,
+          "id" : 71,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 297,
@@ -19621,14 +20747,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
+          "action_ids" : [99],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
-          "base_default_next" : "node_125",
+          "base_default_next" : "node_123",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v4" : "node_125"
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_123"
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19636,7 +20762,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v6",
-          "id" : 74,
+          "id" : 72,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 302,
@@ -19650,14 +20776,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
+          "action_ids" : [100],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v6"],
-          "base_default_next" : "node_125",
+          "base_default_next" : "node_123",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v6" : "node_125"
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_123"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19665,7 +20791,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 75,
+          "id" : 73,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -19704,23 +20830,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94, 86],
+          "action_ids" : [101, 93],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_128",
+          "base_default_next" : "node_126",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_128",
-            "nop" : "node_128"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_126",
+            "nop" : "node_126"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_39",
-          "id" : 76,
+          "name" : "tbl_act_36",
+          "id" : 74,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -19728,14 +20854,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
-          "actions" : ["act_39"],
+          "action_ids" : [158],
+          "actions" : ["act_36"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_39" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_36" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 153,
+            "action_id" : 158,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19743,7 +20869,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 77,
+          "id" : 75,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -19764,23 +20890,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95, 87],
+          "action_ids" : [102, 94],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_131",
+          "base_default_next" : "node_129",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_131",
-            "nop" : "node_131"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_129",
+            "nop" : "node_129"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_40",
-          "id" : 78,
+          "name" : "tbl_act_37",
+          "id" : 76,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -19794,14 +20920,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
-          "actions" : ["act_40"],
-          "base_default_next" : "node_133",
+          "action_ids" : [159],
+          "actions" : ["act_37"],
+          "base_default_next" : "node_131",
           "next_tables" : {
-            "act_40" : "node_133"
+            "act_37" : "node_131"
           },
           "default_entry" : {
-            "action_id" : 154,
+            "action_id" : 159,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19809,7 +20935,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 79,
+          "id" : 77,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -19830,7 +20956,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 90],
+          "action_ids" : [103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 97],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -19853,7 +20979,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 97,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -19873,7 +20999,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 103,
                 "action_data" : []
               },
               "priority" : 1
@@ -19892,7 +21018,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 104,
                 "action_data" : []
               },
               "priority" : 2
@@ -19911,7 +21037,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 105,
                 "action_data" : []
               },
               "priority" : 3
@@ -19930,7 +21056,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 106,
                 "action_data" : []
               },
               "priority" : 4
@@ -19949,7 +21075,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 107,
                 "action_data" : []
               },
               "priority" : 5
@@ -19968,7 +21094,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 108,
                 "action_data" : []
               },
               "priority" : 6
@@ -19987,7 +21113,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 109,
                 "action_data" : []
               },
               "priority" : 7
@@ -20006,7 +21132,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 103,
+                "action_id" : 110,
                 "action_data" : []
               },
               "priority" : 8
@@ -20025,7 +21151,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 111,
                 "action_data" : []
               },
               "priority" : 9
@@ -20044,7 +21170,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 112,
                 "action_data" : []
               },
               "priority" : 10
@@ -20063,7 +21189,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 11
@@ -20082,7 +21208,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 12
@@ -20101,7 +21227,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 13
@@ -20120,7 +21246,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 14
@@ -20139,7 +21265,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 15
@@ -20158,7 +21284,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 16
@@ -20167,7 +21293,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 80,
+          "id" : 78,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -20188,30 +21314,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 91],
+          "action_ids" : [119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 98],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_41",
+          "base_default_next" : "tbl_act_38",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_41",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_41",
-            "NoAction" : "tbl_act_41"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_38",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_38",
+            "NoAction" : "tbl_act_38"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 98,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20231,7 +21357,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 1
@@ -20250,7 +21376,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 2
@@ -20269,7 +21395,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 3
@@ -20288,7 +21414,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 4
@@ -20307,7 +21433,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 5
@@ -20326,7 +21452,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 6
@@ -20345,7 +21471,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 118,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 7
@@ -20364,7 +21490,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 119,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 8
@@ -20383,7 +21509,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 120,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 9
@@ -20402,7 +21528,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 121,
+                "action_id" : 128,
                 "action_data" : []
               },
               "priority" : 10
@@ -20421,7 +21547,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 122,
+                "action_id" : 129,
                 "action_data" : []
               },
               "priority" : 11
@@ -20440,7 +21566,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 123,
+                "action_id" : 130,
                 "action_data" : []
               },
               "priority" : 12
@@ -20459,7 +21585,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 124,
+                "action_id" : 131,
                 "action_data" : []
               },
               "priority" : 13
@@ -20478,7 +21604,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 125,
+                "action_id" : 132,
                 "action_data" : []
               },
               "priority" : 14
@@ -20497,7 +21623,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 126,
+                "action_id" : 133,
                 "action_data" : []
               },
               "priority" : 15
@@ -20516,7 +21642,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 127,
+                "action_id" : 134,
                 "action_data" : []
               },
               "priority" : 16
@@ -20524,8 +21650,8 @@
           ]
         },
         {
-          "name" : "tbl_act_41",
-          "id" : 81,
+          "name" : "tbl_act_38",
+          "id" : 79,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -20539,22 +21665,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
-          "actions" : ["act_42"],
-          "base_default_next" : "node_137",
+          "action_ids" : [161],
+          "actions" : ["act_39"],
+          "base_default_next" : "node_135",
           "next_tables" : {
-            "act_42" : "node_137"
+            "act_39" : "node_135"
           },
           "default_entry" : {
-            "action_id" : 156,
+            "action_id" : 161,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_42",
-          "id" : 82,
+          "name" : "tbl_act_39",
+          "id" : 80,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -20568,22 +21694,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
-          "actions" : ["act_41"],
-          "base_default_next" : "node_139",
+          "action_ids" : [160],
+          "actions" : ["act_38"],
+          "base_default_next" : "node_137",
           "next_tables" : {
-            "act_41" : "node_139"
+            "act_38" : "node_137"
           },
           "default_entry" : {
-            "action_id" : 155,
+            "action_id" : 160,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_43",
-          "id" : 83,
+          "name" : "tbl_act_40",
+          "id" : 81,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -20597,22 +21723,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [157],
-          "actions" : ["act_43"],
-          "base_default_next" : "node_141",
+          "action_ids" : [162],
+          "actions" : ["act_40"],
+          "base_default_next" : "node_139",
           "next_tables" : {
-            "act_43" : "node_141"
+            "act_40" : "node_139"
           },
           "default_entry" : {
-            "action_id" : 157,
+            "action_id" : 162,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_44",
-          "id" : 84,
+          "name" : "tbl_act_41",
+          "id" : 82,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -20626,14 +21752,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["act_44"],
-          "base_default_next" : "node_143",
+          "action_ids" : [163],
+          "actions" : ["act_41"],
+          "base_default_next" : "node_141",
           "next_tables" : {
-            "act_44" : "node_143"
+            "act_41" : "node_141"
           },
           "default_entry" : {
-            "action_id" : 158,
+            "action_id" : 163,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20641,7 +21767,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 85,
+          "id" : 83,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 87,
@@ -20655,15 +21781,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [128, 88],
+          "action_ids" : [135, 95],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_145",
+          "base_default_next" : "node_143",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_145",
-            "nop" : "node_145"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_143",
+            "nop" : "node_143"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 95,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20671,7 +21797,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 86,
+          "id" : 84,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -20685,14 +21811,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [129],
+          "action_ids" : [136],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
           "base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
           },
           "default_entry" : {
-            "action_id" : 129,
+            "action_id" : 136,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20700,7 +21826,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 87,
+          "id" : 85,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -20714,14 +21840,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [130],
+          "action_ids" : [137],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 130,
+            "action_id" : 137,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20760,7 +21886,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
+          "true_next" : "tbl_act_23",
           "false_next" : "node_83"
         },
         {
@@ -20786,7 +21912,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
+          "true_next" : "tbl_act_24",
           "false_next" : "node_85"
         },
         {
@@ -20839,7 +21965,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_26",
+          "true_next" : "tbl_act_25",
           "false_next" : "node_87"
         },
         {
@@ -20922,7 +22048,7 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "tbl_act_27"
+          "false_next" : "tbl_act_26"
         },
         {
           "name" : "node_98",
@@ -21000,7 +22126,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_30",
+          "true_next" : "tbl_act_29",
           "false_next" : "node_105"
         },
         {
@@ -21026,8 +22152,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_31",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_30",
+          "false_next" : "node_113"
         },
         {
           "name" : "node_105",
@@ -21069,7 +22195,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_32",
+          "true_next" : "tbl_act_31",
           "false_next" : "node_109"
         },
         {
@@ -21095,8 +22221,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_113"
         },
         {
           "name" : "node_109",
@@ -21138,8 +22264,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_34",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_33",
+          "false_next" : "node_113"
         },
         {
           "name" : "node_111",
@@ -21164,17 +22290,17 @@
               }
             }
           },
-          "true_next" : "tbl_act_35",
-          "false_next" : "tbl_act_36"
+          "true_next" : "tbl_act_34",
+          "false_next" : "node_113"
         },
         {
-          "name" : "node_114",
+          "name" : "node_113",
           "id" : 40,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 328,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
           },
           "expression" : {
             "type" : "expression",
@@ -21187,50 +22313,26 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw32"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw31"]
                   }
                 }
               },
               "right" : {
                 "type" : "bool",
-                "value" : true
+                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_116"
+          "true_next" : "node_114",
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_116",
+          "name" : "node_114",
           "id" : 41,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_egress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_38",
-          "false_next" : "node_120"
-        },
-        {
-          "name" : "node_118",
-          "id" : 42,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
-            "column" : 12,
+            "line" : 329,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
           "expression" : {
@@ -21244,7 +22346,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap36"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap33"]
                   }
                 }
               },
@@ -21254,11 +22356,44 @@
               }
             }
           },
-          "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_120"
+          "true_next" : "tbl_spgw_gtpu_encap",
+          "false_next" : "node_116"
         },
         {
-          "name" : "node_120",
+          "name" : "node_116",
+          "id" : 42,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 332,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr35"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "tbl_act_35",
+          "false_next" : "node_118"
+        },
+        {
+          "name" : "node_118",
           "id" : 43,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -21272,7 +22407,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type38"]
+                "value" : ["scalars", "fabric_metadata_t._bng_type36"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -21280,11 +22415,11 @@
               }
             }
           },
-          "true_next" : "node_121",
-          "false_next" : "node_125"
+          "true_next" : "node_119",
+          "false_next" : "node_123"
         },
         {
-          "name" : "node_121",
+          "name" : "node_119",
           "id" : 44,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -21304,10 +22439,10 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v4",
-          "false_next" : "node_123"
+          "false_next" : "node_121"
         },
         {
-          "name" : "node_123",
+          "name" : "node_121",
           "id" : 45,
           "source_info" : {
             "filename" : "include/bng.p4",
@@ -21327,10 +22462,10 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v6",
-          "false_next" : "node_125"
+          "false_next" : "node_123"
         },
         {
-          "name" : "node_125",
+          "name" : "node_123",
           "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21407,10 +22542,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_126"
+          "true_next" : "node_124"
         },
         {
-          "name" : "node_126",
+          "name" : "node_124",
           "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21429,7 +22564,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source44"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source42"]
                   }
                 }
               },
@@ -21440,10 +22575,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_128"
+          "false_next" : "node_126"
         },
         {
-          "name" : "node_128",
+          "name" : "node_126",
           "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21463,10 +22598,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_39"
+          "true_next" : "tbl_act_36"
         },
         {
-          "name" : "node_131",
+          "name" : "node_129",
           "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21485,7 +22620,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit45"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit43"]
                   }
                 }
               },
@@ -21495,11 +22630,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_40",
-          "false_next" : "node_133"
+          "true_next" : "tbl_act_37",
+          "false_next" : "node_131"
         },
         {
-          "name" : "node_133",
+          "name" : "node_131",
           "id" : 50,
           "expression" : {
             "type" : "expression",
@@ -21520,10 +22655,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_143"
+          "false_next" : "node_141"
         },
         {
-          "name" : "node_137",
+          "name" : "node_135",
           "id" : 51,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21542,11 +22677,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_42",
-          "false_next" : "node_139"
+          "true_next" : "tbl_act_39",
+          "false_next" : "node_137"
         },
         {
-          "name" : "node_139",
+          "name" : "node_137",
           "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21565,11 +22700,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_43",
-          "false_next" : "node_141"
+          "true_next" : "tbl_act_40",
+          "false_next" : "node_139"
         },
         {
-          "name" : "node_141",
+          "name" : "node_139",
           "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -21588,11 +22723,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_44",
-          "false_next" : "node_143"
+          "true_next" : "tbl_act_41",
+          "false_next" : "node_141"
         },
         {
-          "name" : "node_143",
+          "name" : "node_141",
           "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21615,10 +22750,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_145"
+          "false_next" : "node_143"
         },
         {
-          "name" : "node_145",
+          "name" : "node_143",
           "id" : 55,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -21637,7 +22772,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink46"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink44"]
                   }
                 }
               },
@@ -21685,7 +22820,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 1d379f5..dd55cde 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -697,9 +697,9 @@
 }
 tables {
   preamble {
-    id: 33584493
-    name: "FabricIngress.spgw_ingress.interface_lookup"
-    alias: "interface_lookup"
+    id: 33557250
+    name: "FabricIngress.spgw.interfaces"
+    alias: "interfaces"
   }
   match_fields {
     id: 1
@@ -714,16 +714,21 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16797935
+    id: 16810012
   }
-  const_default_action_id: 16797935
+  action_refs {
+    id: 16783042
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16783042
   size: 128
 }
 tables {
   preamble {
-    id: 33586958
-    name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
-    alias: "downlink_pdr_lookup"
+    id: 33566601
+    name: "FabricIngress.spgw.downlink_pdrs"
+    alias: "downlink_pdrs"
   }
   match_fields {
     id: 1
@@ -732,16 +737,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16799934
+    id: 16800614
   }
-  const_default_action_id: 16799934
+  action_refs {
+    id: 16800567
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
   size: 1024
 }
 tables {
   preamble {
-    id: 33587070
-    name: "FabricIngress.spgw_ingress.uplink_pdr_lookup"
-    alias: "uplink_pdr_lookup"
+    id: 33606410
+    name: "FabricIngress.spgw.uplink_pdrs"
+    alias: "uplink_pdrs"
   }
   match_fields {
     id: 1
@@ -756,16 +765,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16799934
+    id: 16800614
   }
-  const_default_action_id: 16799934
+  action_refs {
+    id: 16800567
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
   size: 1024
 }
 tables {
   preamble {
-    id: 33613200
-    name: "FabricIngress.spgw_ingress.far_lookup"
-    alias: "far_lookup"
+    id: 33599560
+    name: "FabricIngress.spgw.fars"
+    alias: "fars"
   }
   match_fields {
     id: 1
@@ -774,12 +787,15 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16834935
+    id: 16820307
   }
   action_refs {
-    id: 16787606
+    id: 16814785
   }
-  const_default_action_id: 16834935
+  action_refs {
+    id: 16814681
+  }
+  const_default_action_id: 16820307
   size: 2048
 }
 tables {
@@ -902,6 +918,13 @@
 }
 actions {
   preamble {
+    id: 16800567
+    name: "NoAction"
+    alias: "NoAction"
+  }
+}
+actions {
+  preamble {
     id: 16778827
     name: "FabricIngress.process_set_source_sink.int_set_source"
     alias: "int_set_source"
@@ -1314,31 +1337,28 @@
 }
 actions {
   preamble {
-    id: 16797935
-    name: "FabricIngress.spgw_ingress.set_source_iface"
-    alias: "set_source_iface"
+    id: 16810012
+    name: "FabricIngress.spgw.load_iface"
+    alias: "load_iface"
   }
   params {
     id: 1
     name: "src_iface"
     bitwidth: 8
   }
-  params {
-    id: 2
-    name: "direction"
-    bitwidth: 2
-  }
-  params {
-    id: 3
-    name: "skip_spgw"
-    bitwidth: 1
+}
+actions {
+  preamble {
+    id: 16783042
+    name: "FabricIngress.spgw.iface_miss"
+    alias: "iface_miss"
   }
 }
 actions {
   preamble {
-    id: 16799934
-    name: "FabricIngress.spgw_ingress.set_pdr_attributes"
-    alias: "set_pdr_attributes"
+    id: 16800614
+    name: "FabricIngress.spgw.load_pdr"
+    alias: "load_pdr"
   }
   params {
     id: 1
@@ -1358,9 +1378,9 @@
 }
 actions {
   preamble {
-    id: 16834935
-    name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
-    alias: "load_normal_far_attributes"
+    id: 16820307
+    name: "FabricIngress.spgw.load_normal_far"
+    alias: "load_normal_far"
   }
   params {
     id: 1
@@ -1375,9 +1395,9 @@
 }
 actions {
   preamble {
-    id: 16787606
-    name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
-    alias: "load_tunnel_far_attributes"
+    id: 16814785
+    name: "FabricIngress.spgw.load_tunnel_far"
+    alias: "load_tunnel_far"
   }
   params {
     id: 1
@@ -1412,37 +1432,39 @@
 }
 actions {
   preamble {
-    id: 16829280
-    name: "FabricIngress.spgw_ingress.decap_inner_tcp"
-    alias: "decap_inner_tcp"
+    id: 16814681
+    name: "FabricIngress.spgw.load_dbuf_far"
+    alias: "load_dbuf_far"
   }
-}
-actions {
-  preamble {
-    id: 16815878
-    name: "FabricIngress.spgw_ingress.decap_inner_udp"
-    alias: "decap_inner_udp"
+  params {
+    id: 1
+    name: "drop"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16801274
-    name: "FabricIngress.spgw_ingress.decap_inner_icmp"
-    alias: "decap_inner_icmp"
+  params {
+    id: 2
+    name: "notify_cp"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16830582
-    name: "FabricIngress.spgw_ingress.decap_inner_unknown"
-    alias: "decap_inner_unknown"
+  params {
+    id: 3
+    name: "tunnel_src_port"
+    bitwidth: 16
   }
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
+  params {
+    id: 4
+    name: "tunnel_src_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 5
+    name: "tunnel_dst_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 6
+    name: "teid"
+    bitwidth: 32
   }
 }
 actions {
@@ -1616,9 +1638,9 @@
 }
 counters {
   preamble {
-    id: 302029884
-    name: "FabricIngress.spgw_ingress.pdr_counter"
-    alias: "spgw_ingress.pdr_counter"
+    id: 302043952
+    name: "FabricIngress.spgw.pdr_counter"
+    alias: "FabricIngress.spgw.pdr_counter"
   }
   spec {
     unit: BOTH
@@ -1638,9 +1660,9 @@
 }
 counters {
   preamble {
-    id: 302012289
-    name: "FabricEgress.spgw_egress.pdr_counter"
-    alias: "spgw_egress.pdr_counter"
+    id: 302049491
+    name: "FabricEgress.spgw.pdr_counter"
+    alias: "FabricEgress.spgw.pdr_counter"
   }
   spec {
     unit: BOTH
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index e2d828c..1151554 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -2698,7 +2698,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 155,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -3116,7 +3116,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 161,
+            "line" : 151,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -9204,7 +9204,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 116,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -9283,7 +9283,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 656ae22..f5064b5 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -5,14 +5,13 @@
       "id" : 0,
       "fields" : [
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
+        ["tmp_2", 16, false],
+        ["tmp_3", 4, false],
         ["tmp", 32, false],
-        ["tmp_3", 32, false],
-        ["spgw_ingress_hasReturned", 1, false],
+        ["tmp_0", 32, false],
+        ["spgw_tmp", 1, false],
         ["egress_next_tmp", 1, false],
-        ["spgw_egress_hasReturned", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
         ["fabric_metadata_t._ip_eth_type0", 16, false],
         ["fabric_metadata_t._vlan_id1", 12, false],
@@ -33,30 +32,27 @@
         ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
         ["fabric_metadata_t._inner_l4_sport17", 16, false],
         ["fabric_metadata_t._inner_l4_dport18", 16, false],
-        ["fabric_metadata_t._spgw_direction19", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len20", 16, false],
-        ["fabric_metadata_t._spgw_teid21", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_port22", 16, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr23", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr24", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id25", 32, false],
-        ["fabric_metadata_t._spgw_far_id26", 32, false],
-        ["fabric_metadata_t._spgw_src_iface27", 8, false],
-        ["fabric_metadata_t._spgw_skip_spgw28", 1, false],
-        ["fabric_metadata_t._spgw_pdr_hit29", 1, false],
-        ["fabric_metadata_t._spgw_far_dropped30", 1, false],
-        ["fabric_metadata_t._spgw_notify_spgwc31", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_encap32", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_decap33", 1, false],
-        ["fabric_metadata_t._int_meta_source34", 1, false],
-        ["fabric_metadata_t._int_meta_transit35", 1, false],
-        ["fabric_metadata_t._int_meta_sink36", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id37", 32, false],
-        ["fabric_metadata_t._int_meta_new_words38", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes39", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp40", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp41", 32, false],
-        ["_padding_0", 4, false]
+        ["fabric_metadata_t._spgw_ipv4_len19", 16, false],
+        ["fabric_metadata_t._spgw_teid20", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_src_port21", 16, false],
+        ["fabric_metadata_t._spgw_tunnel_src_addr22", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_dst_addr23", 32, false],
+        ["fabric_metadata_t._spgw_ctr_id24", 32, false],
+        ["fabric_metadata_t._spgw_far_id25", 32, false],
+        ["fabric_metadata_t._spgw_src_iface26", 8, false],
+        ["fabric_metadata_t._spgw_skip_spgw27", 1, false],
+        ["fabric_metadata_t._spgw_notify_spgwc28", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_encap29", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_decap30", 1, false],
+        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr31", 1, false],
+        ["fabric_metadata_t._int_meta_source32", 1, false],
+        ["fabric_metadata_t._int_meta_transit33", 1, false],
+        ["fabric_metadata_t._int_meta_sink34", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id35", 32, false],
+        ["fabric_metadata_t._int_meta_new_words36", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes37", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp38", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp39", 32, false]
       ]
     },
     {
@@ -652,7 +648,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -690,7 +686,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -711,7 +707,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -737,7 +733,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -847,7 +843,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -873,7 +869,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -1504,11 +1500,11 @@
       "is_direct" : false
     },
     {
-      "name" : "FabricIngress.spgw_ingress.pdr_counter",
+      "name" : "FabricIngress.spgw.pdr_counter",
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 180,
+        "line" : 109,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1540,11 +1536,11 @@
       }
     },
     {
-      "name" : "FabricEgress.spgw_egress.pdr_counter",
+      "name" : "FabricEgress.spgw.pdr_counter",
       "id" : 15,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 301,
+        "line" : 286,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1620,7 +1616,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1789,16 +1785,28 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "name" : "NoAction",
       "id" : 8,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 9,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "id" : 10,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source34"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source32"]
             },
             {
               "type" : "expression",
@@ -1826,7 +1834,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 9,
+      "id" : 11,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1891,13 +1899,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 10,
+      "id" : 12,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 11,
+      "id" : 13,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -1928,7 +1936,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 12,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -1959,7 +1967,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 13,
+      "id" : 15,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1990,7 +1998,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 14,
+      "id" : 16,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2040,7 +2048,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 15,
+      "id" : 17,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2071,13 +2079,13 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 16,
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.acl.set_next_id_acl",
-      "id" : 17,
+      "id" : 19,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2108,7 +2116,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 18,
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2163,7 +2171,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 19,
+      "id" : 21,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -2194,7 +2202,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 20,
+      "id" : 22,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2245,13 +2253,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 21,
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 22,
+      "id" : 24,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -2282,68 +2290,6 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 23,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 31,
-            "column" : 5,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 24,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 115,
-            "column" : 32,
-            "source_fragment" : "= next_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_hashed",
       "id" : 25,
       "runtime_data" : [
         {
@@ -2374,10 +2320,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.routing_hashed",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
       "id" : 26,
       "runtime_data" : [
         {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 115,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
+      "id" : 27,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.routing_hashed",
+      "id" : 28,
+      "runtime_data" : [
+        {
           "name" : "port_num",
           "bitwidth" : 9
         },
@@ -2452,7 +2460,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 27,
+      "id" : 29,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2552,7 +2560,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 28,
+      "id" : 30,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -2611,20 +2619,1666 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_source_iface",
-      "id" : 29,
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
+      "id" : 31,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp",
+      "id" : 32,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "id" : 33,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "id" : 34,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_tcp",
+      "id" : 35,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_udp",
+      "id" : 36,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_icmp",
+      "id" : 37,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_unknown",
+      "id" : 38,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_iface",
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "src_iface",
           "bitwidth" : 8
-        },
-        {
-          "name" : "direction",
-          "bitwidth" : 2
-        },
-        {
-          "name" : "skip_spgw",
-          "bitwidth" : 1
         }
       ],
       "primitives" : [
@@ -2633,7 +4287,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
             },
             {
               "type" : "runtime_data",
@@ -2642,7 +4296,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 50,
+            "line" : 121,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -2652,26 +4306,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
-            },
-            {
-              "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_spgw28"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
             },
             {
               "type" : "expression",
@@ -2681,18 +4316,8 @@
                   "op" : "b2d",
                   "left" : null,
                   "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 2
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
+                    "type" : "bool",
+                    "value" : false
                   }
                 }
               }
@@ -2700,16 +4325,71 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 52,
+            "line" : 122,
             "column" : 33,
-            "source_fragment" : "= (bool)skip_spgw; ..."
+            "source_fragment" : "= false; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 30,
+      "name" : "FabricIngress.spgw.iface_miss",
+      "id" : 40,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 44,
+            "source_fragment" : "8w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 126,
+            "column" : 33,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 41,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2730,36 +4410,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit29"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -2768,7 +4419,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2778,7 +4429,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -2787,7 +4438,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2797,7 +4448,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -2826,7 +4477,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2834,8 +4485,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 31,
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 42,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2856,36 +4507,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit29"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -2894,7 +4516,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2904,7 +4526,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -2913,7 +4535,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2923,7 +4545,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -2952,7 +4574,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2960,8 +4582,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 32,
+      "name" : "FabricIngress.spgw.load_normal_far",
+      "id" : 43,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -2978,7 +4600,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -3007,8 +4629,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 138,
-            "column" : 35,
+            "line" : 186,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -3017,7 +4639,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 187,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -3046,7 +4707,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 139,
+            "line" : 188,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -3054,8 +4715,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 33,
+      "name" : "FabricIngress.spgw.load_tunnel_far",
+      "id" : 44,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -3088,7 +4749,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -3117,8 +4778,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 148,
-            "column" : 35,
+            "line" : 197,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -3127,7 +4788,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -3156,7 +4856,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 149,
+            "line" : 199,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -3166,7 +4866,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
             },
             {
               "type" : "expression",
@@ -3185,7 +4885,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 201,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -3195,7 +4895,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
             },
             {
               "type" : "runtime_data",
@@ -3204,7 +4904,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 202,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -3214,7 +4914,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
             },
             {
               "type" : "runtime_data",
@@ -3223,7 +4923,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 203,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -3233,7 +4933,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
             },
             {
               "type" : "runtime_data",
@@ -3242,7 +4942,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 204,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -3252,7 +4952,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
             },
             {
               "type" : "runtime_data",
@@ -3261,7 +4961,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 205,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -3280,7 +4980,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 207,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -3299,7 +4999,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 158,
+            "line" : 208,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -3318,7 +5018,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 209,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -3337,7 +5037,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 210,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -3345,27 +5045,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
-      "id" : 34,
-      "runtime_data" : [],
+      "name" : "FabricIngress.spgw.load_dbuf_far",
+      "id" : 45,
+      "runtime_data" : [
+        {
+          "name" : "drop",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "notify_cp",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "tunnel_src_port",
+          "bitwidth" : 16
+        },
+        {
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "teid",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 197,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -3373,18 +5118,38 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -3392,199 +5157,67 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 199,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
           }
         },
         {
-          "op" : "assign_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "tcp"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
             },
             {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 200,
-            "column" : 8,
-            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 201,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_tcp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_udp",
-      "id" : 35,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -3592,18 +5225,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "runtime_data",
+              "value" : 5
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 202,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -3611,18 +5244,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "line" : 203,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -3630,18 +5263,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "line" : 204,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -3649,165 +5282,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_udp"
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 205,
-            "column" : 8,
-            "source_fragment" : "hdr.udp = hdr.inner_udp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 206,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_udp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_icmp",
-      "id" : 36,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3818,15 +5304,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
+            "line" : 207,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -3837,15 +5323,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 208,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3856,15 +5342,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 209,
             "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -3875,158 +5361,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "hexstr",
+              "value" : "0x0868"
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 210,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "icmp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 211,
-            "column" : 8,
-            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 212,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_icmp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_unknown",
-      "id" : 37,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
             "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "source_fragment" : "= 2152; ..."
           }
         },
         {
@@ -4034,146 +5377,35 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 216,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "line" : 221,
+            "column" : 43,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 38,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4253,7 +5485,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 39,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4261,7 +5493,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
+              "value" : ["scalars", "spgw_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 48,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_tmp"]
             },
             {
               "type" : "expression",
@@ -4282,44 +5544,8 @@
       ]
     },
     {
-      "name" : "act_1",
-      "id" : 40,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_2",
-      "id" : 41,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4327,17 +5553,17 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricIngress.spgw_ingress.pdr_counter"
+              "value" : "FabricIngress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
+            "line" : 256,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -4345,7 +5571,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 42,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4353,72 +5579,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 281,
-            "column" : 32,
-            "source_fragment" : "= true; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 43,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
             },
             {
               "type" : "field",
@@ -4427,16 +5588,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 273,
+            "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 44,
+      "name" : "act_4",
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4499,8 +5660,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 45,
+      "name" : "act_5",
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4525,8 +5686,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 46,
+      "name" : "act_6",
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4583,8 +5744,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 47,
+      "name" : "act_7",
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4592,7 +5753,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -4628,7 +5789,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
@@ -4642,37 +5803,37 @@
     },
     {
       "name" : "nop",
-      "id" : 48,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 49,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 50,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 51,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 52,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 53,
+      "id" : 60,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -4740,7 +5901,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 155,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -5158,7 +6319,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 161,
+            "line" : 151,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -5167,7 +6328,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 54,
+      "id" : 61,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -5180,7 +6341,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit33"]
             },
             {
               "type" : "expression",
@@ -5209,7 +6370,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             },
             {
               "type" : "runtime_data",
@@ -5227,13 +6388,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 55,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 56,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5307,7 +6468,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -5321,7 +6482,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5349,7 +6510,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -5363,7 +6524,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5390,7 +6551,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 57,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5432,7 +6593,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -5446,7 +6607,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5474,7 +6635,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -5488,7 +6649,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5515,7 +6676,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 58,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5623,7 +6784,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -5637,7 +6798,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5665,7 +6826,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -5679,7 +6840,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5706,7 +6867,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 59,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5793,7 +6954,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -5807,7 +6968,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5835,7 +6996,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -5849,7 +7010,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5876,7 +7037,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 60,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6029,7 +7190,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6043,7 +7204,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6071,7 +7232,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -6085,7 +7246,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6112,7 +7273,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 61,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6233,7 +7394,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6247,7 +7408,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6275,7 +7436,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -6289,7 +7450,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6316,7 +7477,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 62,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6503,7 +7664,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6517,7 +7678,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6545,7 +7706,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -6559,7 +7720,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6586,7 +7747,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 63,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6613,7 +7774,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -6628,7 +7789,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6642,7 +7803,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6670,7 +7831,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -6684,7 +7845,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6711,7 +7872,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 64,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6804,7 +7965,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -6819,7 +7980,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6833,7 +7994,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6861,7 +8022,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -6875,7 +8036,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6902,7 +8063,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 65,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6963,7 +8124,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -6978,7 +8139,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -6992,7 +8153,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7020,7 +8181,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -7034,7 +8195,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7061,7 +8222,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 66,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7188,7 +8349,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -7203,7 +8364,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -7217,7 +8378,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7245,7 +8406,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -7259,7 +8420,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7286,7 +8447,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 67,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7392,7 +8553,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -7407,7 +8568,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -7421,7 +8582,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7449,7 +8610,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -7463,7 +8624,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7490,7 +8651,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 68,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7662,7 +8823,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -7677,7 +8838,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -7691,7 +8852,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7719,7 +8880,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -7733,7 +8894,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7760,7 +8921,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 69,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7900,7 +9061,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -7915,7 +9076,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -7929,7 +9090,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7957,7 +9118,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -7971,7 +9132,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7998,7 +9159,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 70,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8204,7 +9365,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
             }
           ],
           "source_info" : {
@@ -8219,7 +9380,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -8233,7 +9394,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8261,7 +9422,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8275,7 +9436,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8302,13 +9463,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 71,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 72,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8350,7 +9511,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -8364,7 +9525,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8392,7 +9553,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8406,7 +9567,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8433,7 +9594,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 73,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8494,7 +9655,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -8508,7 +9669,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8536,7 +9697,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8550,7 +9711,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8577,7 +9738,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 74,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8672,7 +9833,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -8686,7 +9847,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8714,7 +9875,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8728,7 +9889,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8755,7 +9916,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 75,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8820,7 +9981,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -8834,7 +9995,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8862,7 +10023,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -8876,7 +10037,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8903,7 +10064,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 76,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9002,7 +10163,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9016,7 +10177,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9044,7 +10205,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9058,7 +10219,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9085,7 +10246,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 77,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9203,7 +10364,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9217,7 +10378,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9245,7 +10406,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9259,7 +10420,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9286,7 +10447,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 78,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9438,7 +10599,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9452,7 +10613,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9480,7 +10641,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9494,7 +10655,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9521,7 +10682,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 79,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9563,7 +10724,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9577,7 +10738,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9605,7 +10766,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9619,7 +10780,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9646,7 +10807,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 80,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9722,7 +10883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9736,7 +10897,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9764,7 +10925,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9778,7 +10939,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9805,7 +10966,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 81,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9900,7 +11061,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -9914,7 +11075,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9942,7 +11103,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -9956,7 +11117,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9983,7 +11144,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 82,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10112,7 +11273,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -10126,7 +11287,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10154,7 +11315,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -10168,7 +11329,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10195,7 +11356,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 83,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10294,7 +11455,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -10308,7 +11469,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10336,7 +11497,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -10350,7 +11511,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10377,7 +11538,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 84,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10510,7 +11671,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -10524,7 +11685,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10552,7 +11713,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -10566,7 +11727,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10593,7 +11754,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 85,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10745,7 +11906,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -10759,7 +11920,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10787,7 +11948,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -10801,7 +11962,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10828,7 +11989,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 86,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11014,7 +12175,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
             },
             {
               "type" : "expression",
@@ -11028,7 +12189,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11056,7 +12217,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
             },
             {
               "type" : "expression",
@@ -11070,7 +12231,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11097,7 +12258,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 87,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11138,7 +12299,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 88,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11246,7 +12407,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 116,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -11255,7 +12416,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 89,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11325,7 +12486,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -11353,7 +12514,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 90,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11374,8 +12535,8 @@
       ]
     },
     {
-      "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 91,
+      "name" : "FabricEgress.spgw.gtpu_encap",
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11388,7 +12549,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 291,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -11407,7 +12568,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 292,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -11426,7 +12587,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 133,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -11445,7 +12606,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 294,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -11464,7 +12625,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 295,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -11506,7 +12667,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 296,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -11525,7 +12686,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 298,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -11544,7 +12705,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 299,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -11563,7 +12724,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 300,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -11582,7 +12743,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 146,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -11601,7 +12762,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 130,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -11615,12 +12776,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 303,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -11634,12 +12795,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 304,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -11658,7 +12819,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 305,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -11673,7 +12834,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -11687,12 +12848,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 323,
+            "line" : 308,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -11711,7 +12872,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -11735,7 +12896,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11753,7 +12914,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 310,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -11772,7 +12933,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -11787,7 +12948,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -11806,7 +12967,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -11825,7 +12986,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -11844,7 +13005,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -11863,7 +13024,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -11882,7 +13043,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -11901,7 +13062,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -11920,7 +13081,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -11934,12 +13095,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -11953,12 +13114,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -11966,8 +13127,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 92,
+      "name" : "act_8",
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11983,8 +13144,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 93,
+      "name" : "act_9",
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12034,8 +13195,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 94,
+      "name" : "act_10",
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12056,8 +13217,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 95,
+      "name" : "act_11",
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12086,8 +13247,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 96,
+      "name" : "act_12",
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12116,8 +13277,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 97,
+      "name" : "act_13",
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12138,8 +13299,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 98,
+      "name" : "act_14",
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12187,8 +13348,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 99,
+      "name" : "act_15",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12209,8 +13370,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 100,
+      "name" : "act_16",
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12258,74 +13419,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 101,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 102,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 103,
+      "name" : "act_17",
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12333,25 +13428,25 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricEgress.spgw_egress.pdr_counter"
+              "value" : "FabricEgress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
+            "line" : 333,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 104,
+      "name" : "act_18",
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12380,8 +13475,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 105,
+      "name" : "act_19",
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12416,8 +13511,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 106,
+      "name" : "act_20",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12443,7 +13538,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       }
                     }
                   },
@@ -12465,8 +13560,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 107,
+      "name" : "act_21",
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12514,8 +13609,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 108,
+      "name" : "act_22",
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12541,7 +13636,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes39"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
                       }
                     }
                   },
@@ -12563,8 +13658,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 109,
+      "name" : "act_23",
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12590,7 +13685,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words38"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
                       }
                     }
                   },
@@ -12640,50 +13735,27 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
+          "action_ids" : [46],
           "actions" : ["act"],
-          "base_default_next" : "tbl_act_0",
+          "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
-            "act" : "tbl_act_0"
+            "act" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_0",
+          "name" : "FabricIngress.spgw.interfaces",
           "id" : 1,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_0"],
-          "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
-          "next_tables" : {
-            "act_0" : "FabricIngress.spgw_ingress.interface_lookup"
-          },
-          "default_entry" : {
-            "action_id" : 39,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.interface_lookup",
-          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 55,
+            "line" : 130,
             "column" : 10,
-            "source_fragment" : "interface_lookup"
+            "source_fragment" : "interfaces"
           },
           "key" : [
             {
@@ -12705,40 +13777,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [29],
-          "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
-          "base_default_next" : "node_6",
+          "action_ids" : [39, 40],
+          "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.spgw_ingress.set_source_iface" : "node_6"
-          },
-          "default_entry" : {
-            "action_id" : 29,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x1"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_8",
-          "next_tables" : {
-            "act_1" : "node_8"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
             "action_id" : 40,
@@ -12748,92 +13792,8 @@
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "id" : 4,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 93,
-            "column" : 10,
-            "source_fragment" : "uplink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "teid",
-              "target" : ["gtpu", "teid"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [31],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 31,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 82,
-            "column" : 10,
-            "source_fragment" : "downlink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [30],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 30,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_2",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
+          "name" : "tbl_act_0",
+          "id" : 2,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12841,25 +13801,48 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_13",
+          "action_ids" : [47],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "act_2" : "node_13"
+            "act_0" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "id" : 7,
+          "name" : "tbl_act_1",
+          "id" : 3,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [48],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 48,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 75,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -12889,17 +13872,17 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34, 35, 36, 37],
-          "actions" : ["FabricIngress.spgw_ingress.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_inner_udp", "FabricIngress.spgw_ingress.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_inner_unknown"],
-          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "action_ids" : [31, 32, 33, 34],
+          "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 34,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12908,7 +13891,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 233,
+                "line" : 89,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -12927,7 +13910,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 34,
+                "action_id" : 31,
                 "action_data" : []
               },
               "priority" : 1
@@ -12935,7 +13918,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 234,
+                "line" : 90,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -12954,7 +13937,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 35,
+                "action_id" : 32,
                 "action_data" : []
               },
               "priority" : 2
@@ -12962,7 +13945,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 91,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -12981,7 +13964,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 36,
+                "action_id" : 33,
                 "action_data" : []
               },
               "priority" : 3
@@ -12989,19 +13972,262 @@
           ]
         },
         {
-          "name" : "FabricIngress.spgw_ingress.far_lookup",
+          "name" : "FabricIngress.spgw.uplink_pdrs",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 168,
+            "column" : 10,
+            "source_fragment" : "uplink_pdrs"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "teid",
+              "target" : ["gtpu", "teid"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [42, 9],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 9,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.downlink_pdrs",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 157,
+            "column" : 10,
+            "source_fragment" : "downlink_pdrs"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [41, 8],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 8,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 256,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [49],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_15",
+          "next_tables" : {
+            "act_2" : "node_15"
+          },
+          "default_entry" : {
+            "action_id" : 49,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 163,
+            "line" : 75,
             "column" : 10,
-            "source_fragment" : "far_lookup"
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [35, 36, 37, 38],
+          "actions" : ["FabricIngress.spgw.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu.decap_inner_udp", "FabricIngress.spgw.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu.decap_inner_unknown"],
+          "base_default_next" : "FabricIngress.spgw.fars",
+          "next_tables" : {
+            "FabricIngress.spgw.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw.fars"
+          },
+          "default_entry" : {
+            "action_id" : 38,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 89,
+                "column" : 12,
+                "source_fragment" : "(true, false, false) : decap_inner_tcp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 35,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 90,
+                "column" : 12,
+                "source_fragment" : "(false, true, false) : decap_inner_udp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 36,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "column" : 12,
+                "source_fragment" : "(false, false, true) : decap_inner_icmp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 37,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw.fars",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 224,
+            "column" : 10,
+            "source_fragment" : "fars"
           },
           "key" : [
             {
               "match_type" : "exact",
               "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id26"],
+              "target" : ["scalars", "fabric_metadata_t._spgw_far_id25"],
               "mask" : null
             }
           ],
@@ -13011,56 +14237,28 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 33],
-          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
-          "base_default_next" : "node_16",
+          "action_ids" : [43, 44, 45],
+          "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
+          "base_default_next" : "tbl_act_3",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_16",
-            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_16"
+            "FabricIngress.spgw.load_normal_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
           },
           "default_entry" : {
-            "action_id" : 32,
+            "action_id" : 43,
             "action_const" : true,
-            "action_data" : ["0x1", "0x1"],
+            "action_data" : ["0x1", "0x0"],
             "action_entry_const" : true
           }
         },
         {
           "name" : "tbl_act_3",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_3"],
-          "base_default_next" : "tbl_act_4",
-          "next_tables" : {
-            "act_3" : "tbl_act_4"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_4",
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 273,
+            "column" : 36,
             "source_fragment" : "="
           },
           "key" : [],
@@ -13070,21 +14268,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_4"],
+          "action_ids" : [50],
+          "actions" : ["act_3"],
           "base_default_next" : "node_19",
           "next_tables" : {
-            "act_4" : "node_19"
+            "act_3" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_4",
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -13099,21 +14297,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_5"],
+          "action_ids" : [51],
+          "actions" : ["act_4"],
           "base_default_next" : "node_21",
           "next_tables" : {
-            "act_5" : "node_21"
+            "act_4" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_act_5",
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -13128,14 +14326,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_6"],
+          "action_ids" : [52],
+          "actions" : ["act_5"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_5" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13176,7 +14374,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [9, 10, 11],
+          "action_ids" : [11, 12, 13],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -13185,7 +14383,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 11,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13232,14 +14430,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12],
+          "action_ids" : [14],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_25",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_25"
           },
           "default_entry" : {
-            "action_id" : 12,
+            "action_id" : 14,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -13274,7 +14472,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 1],
+          "action_ids" : [15, 1],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -13311,7 +14509,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 2],
+          "action_ids" : [16, 2],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -13348,7 +14546,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 16, 3],
+          "action_ids" : [17, 18, 3],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -13452,7 +14650,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 18, 19, 20, 21],
+          "action_ids" : [19, 20, 21, 22, 23],
           "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_33",
           "next_tables" : {
@@ -13463,7 +14661,7 @@
             "FabricIngress.acl.nop_acl" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 21,
+            "action_id" : 23,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13498,7 +14696,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 24, 5],
+          "action_ids" : [25, 26, 5],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -13537,7 +14735,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 26, 27, 6],
+          "action_ids" : [27, 28, 29, 6],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -13570,7 +14768,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [28, 7],
+          "action_ids" : [30, 7],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -13607,7 +14805,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 4],
+          "action_ids" : [24, 4],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
           "base_default_next" : "node_38",
           "next_tables" : {
@@ -13622,7 +14820,7 @@
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_act_6",
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -13637,21 +14835,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_7"],
+          "action_ids" : [53],
+          "actions" : ["act_6"],
           "base_default_next" : "node_40",
           "next_tables" : {
-            "act_7" : "node_40"
+            "act_6" : "node_40"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_act_7",
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -13666,14 +14864,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_8"],
+          "action_ids" : [54],
+          "actions" : ["act_7"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_8" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_7" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13702,7 +14900,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [8, 0],
+          "action_ids" : [10, 0],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
@@ -13777,72 +14975,58 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "tbl_act_0"
+          "false_next" : "FabricIngress.spgw.interfaces"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "spgw_tmp"]
+              }
+            }
+          },
+          "true_next" : "node_8",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_8",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "line" : 246,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
               "op" : "==",
               "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
-                  }
-                }
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
               },
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "hexstr",
+                "value" : "0x03"
               }
             }
           },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_8"
+          "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "false_next" : "node_10"
         },
         {
-          "name" : "node_8",
-          "id" : 2,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_9",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_9",
+          "name" : "node_10",
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 253,
-            "column" : 12,
+            "line" : 250,
+            "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
           "expression" : {
@@ -13856,16 +15040,42 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "false_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+          "true_next" : "FabricIngress.spgw.uplink_pdrs",
+          "false_next" : "FabricIngress.spgw.downlink_pdrs"
         },
         {
           "name" : "node_13",
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
-            "column" : 12,
+            "line" : 255,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_15"
+        },
+        {
+          "name" : "node_15",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 260,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
           "expression" : {
@@ -13879,7 +15089,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
                   }
                 }
               },
@@ -13889,41 +15099,8 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "false_next" : "FabricIngress.spgw_ingress.far_lookup"
-        },
-        {
-          "name" : "node_16",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 277,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.far_dropped == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_3",
-          "false_next" : "tbl_act_4"
+          "true_next" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
+          "false_next" : "FabricIngress.spgw.fars"
         },
         {
           "name" : "node_19",
@@ -13945,7 +15122,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_act_4",
           "false_next" : "node_21"
         },
         {
@@ -13975,7 +15152,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_act_5",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -14145,7 +15322,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_act_6",
           "false_next" : "node_40"
         },
         {
@@ -14171,7 +15348,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_8",
+          "true_next" : "tbl_act_7",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -14188,7 +15365,7 @@
       "init_table" : "node_45",
       "tables" : [
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_act_8",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -14203,21 +15380,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
-          "actions" : ["act_9"],
+          "action_ids" : [99],
+          "actions" : ["act_8"],
           "base_default_next" : "node_47",
           "next_tables" : {
-            "act_9" : "node_47"
+            "act_8" : "node_47"
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_act_9",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -14232,21 +15409,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["act_10"],
+          "action_ids" : [100],
+          "actions" : ["act_9"],
           "base_default_next" : "node_49",
           "next_tables" : {
-            "act_10" : "node_49"
+            "act_9" : "node_49"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act_10",
           "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14261,14 +15438,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["act_11"],
+          "action_ids" : [101],
+          "actions" : ["act_10"],
           "base_default_next" : "node_51",
           "next_tables" : {
-            "act_11" : "node_51"
+            "act_10" : "node_51"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 101,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14290,14 +15467,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
+          "action_ids" : [94],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14319,14 +15496,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
+          "action_ids" : [95],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 95,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14361,22 +15538,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90, 50],
+          "action_ids" : [97, 57],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_12",
-            "__MISS__" : "tbl_act_13"
+            "__HIT__" : "tbl_act_11",
+            "__MISS__" : "tbl_act_12"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_act_11",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -14385,21 +15562,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
-          "actions" : ["act_12"],
+          "action_ids" : [102],
+          "actions" : ["act_11"],
           "base_default_next" : "node_58",
           "next_tables" : {
-            "act_12" : "node_58"
+            "act_11" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 102,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
+          "name" : "tbl_act_12",
           "id" : 33,
           "key" : [],
           "match_type" : "exact",
@@ -14408,14 +15585,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96],
-          "actions" : ["act_13"],
+          "action_ids" : [103],
+          "actions" : ["act_12"],
           "base_default_next" : "node_58",
           "next_tables" : {
-            "act_13" : "node_58"
+            "act_12" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 103,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14437,21 +15614,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89],
+          "action_ids" : [96],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "node_61",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 96,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
+          "name" : "tbl_act_13",
           "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14466,21 +15643,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [98],
-          "actions" : ["act_15"],
+          "action_ids" : [105],
+          "actions" : ["act_14"],
           "base_default_next" : "node_63",
           "next_tables" : {
-            "act_15" : "node_63"
+            "act_14" : "node_63"
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 105,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_act_14",
           "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14495,21 +15672,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
-          "actions" : ["act_14"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [104],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "act_14" : "tbl_act_18"
+            "act_13" : "node_69"
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 104,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_act_15",
           "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14524,21 +15701,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [100],
-          "actions" : ["act_17"],
+          "action_ids" : [107],
+          "actions" : ["act_16"],
           "base_default_next" : "node_67",
           "next_tables" : {
-            "act_17" : "node_67"
+            "act_16" : "node_67"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_16",
           "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -14553,107 +15730,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [99],
-          "actions" : ["act_16"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [106],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "act_16" : "tbl_act_18"
+            "act_15" : "node_69"
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "tbl_spgw_gtpu_encap",
           "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [102],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_19" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 102,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_19",
-          "id" : 40,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [101],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_72",
-          "next_tables" : {
-            "act_18" : "node_72"
-          },
-          "default_entry" : {
-            "action_id" : 101,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 41,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [103],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_74",
-          "next_tables" : {
-            "act_20" : "node_74"
-          },
-          "default_entry" : {
-            "action_id" : 103,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 42,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 347,
-            "column" : 12,
+            "line" : 330,
+            "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -14663,14 +15759,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_76",
+          "action_ids" : [98],
+          "actions" : ["FabricEgress.spgw.gtpu_encap"],
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_76"
+            "FabricEgress.spgw.gtpu_encap" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 98,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 40,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 333,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [108],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_74",
+          "next_tables" : {
+            "act_17" : "node_74"
+          },
+          "default_entry" : {
+            "action_id" : 108,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14678,7 +15803,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 43,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -14717,23 +15842,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53, 48],
+          "action_ids" : [60, 55],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_79",
+          "base_default_next" : "node_77",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_79",
-            "nop" : "node_79"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_77",
+            "nop" : "node_77"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 44,
+          "name" : "tbl_act_18",
+          "id" : 42,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14741,14 +15866,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104],
-          "actions" : ["act_21"],
+          "action_ids" : [109],
+          "actions" : ["act_18"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_21" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_18" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 109,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14756,7 +15881,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 45,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -14777,23 +15902,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54, 49],
+          "action_ids" : [61, 56],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_82",
+          "base_default_next" : "node_80",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_82",
-            "nop" : "node_82"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_80",
+            "nop" : "node_80"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 46,
+          "name" : "tbl_act_19",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -14807,14 +15932,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_84",
+          "action_ids" : [110],
+          "actions" : ["act_19"],
+          "base_default_next" : "node_82",
           "next_tables" : {
-            "act_22" : "node_84"
+            "act_19" : "node_82"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14822,7 +15947,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 47,
+          "id" : 45,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -14843,7 +15968,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 51],
+          "action_ids" : [62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 58],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -14866,7 +15991,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 58,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -14886,7 +16011,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 55,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 1
@@ -14905,7 +16030,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 56,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 2
@@ -14924,7 +16049,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 57,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 3
@@ -14943,7 +16068,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 58,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 4
@@ -14962,7 +16087,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 5
@@ -14981,7 +16106,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 60,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 6
@@ -15000,7 +16125,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 61,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 7
@@ -15019,7 +16144,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 62,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 8
@@ -15038,7 +16163,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 63,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 9
@@ -15057,7 +16182,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 64,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 10
@@ -15076,7 +16201,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 65,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 11
@@ -15095,7 +16220,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 66,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 12
@@ -15114,7 +16239,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 67,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 13
@@ -15133,7 +16258,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 14
@@ -15152,7 +16277,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 15
@@ -15171,7 +16296,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 16
@@ -15180,7 +16305,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 48,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -15201,30 +16326,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 52],
+          "action_ids" : [78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 59],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_23",
+          "base_default_next" : "tbl_act_20",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_23",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_23",
-            "NoAction" : "tbl_act_23"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_20",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_20",
+            "NoAction" : "tbl_act_20"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 59,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -15244,7 +16369,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 1
@@ -15263,7 +16388,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 2
@@ -15282,7 +16407,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 3
@@ -15301,7 +16426,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 4
@@ -15320,7 +16445,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 5
@@ -15339,7 +16464,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 6
@@ -15358,7 +16483,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 7
@@ -15377,7 +16502,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 8
@@ -15396,7 +16521,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 9
@@ -15415,7 +16540,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 10
@@ -15434,7 +16559,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 11
@@ -15453,7 +16578,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 12
@@ -15472,7 +16597,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 13
@@ -15491,7 +16616,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 14
@@ -15510,7 +16635,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 15
@@ -15529,7 +16654,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 93,
                 "action_data" : []
               },
               "priority" : 16
@@ -15537,8 +16662,8 @@
           ]
         },
         {
-          "name" : "tbl_act_23",
-          "id" : 49,
+          "name" : "tbl_act_20",
+          "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -15552,22 +16677,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_88",
+          "action_ids" : [112],
+          "actions" : ["act_21"],
+          "base_default_next" : "node_86",
           "next_tables" : {
-            "act_24" : "node_88"
+            "act_21" : "node_86"
           },
           "default_entry" : {
-            "action_id" : 107,
+            "action_id" : 112,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 50,
+          "name" : "tbl_act_21",
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -15581,22 +16706,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_90",
+          "action_ids" : [111],
+          "actions" : ["act_20"],
+          "base_default_next" : "node_88",
           "next_tables" : {
-            "act_23" : "node_90"
+            "act_20" : "node_88"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 51,
+          "name" : "tbl_act_22",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -15610,22 +16735,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_92",
+          "action_ids" : [113],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_90",
           "next_tables" : {
-            "act_25" : "node_92"
+            "act_22" : "node_90"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 113,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 52,
+          "name" : "tbl_act_23",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -15639,14 +16764,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109],
-          "actions" : ["act_26"],
+          "action_ids" : [114],
+          "actions" : ["act_23"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_26" : null
+            "act_23" : null
           },
           "default_entry" : {
-            "action_id" : 109,
+            "action_id" : 114,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15685,7 +16810,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_act_8",
           "false_next" : "node_47"
         },
         {
@@ -15711,7 +16836,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_act_9",
           "false_next" : "node_49"
         },
         {
@@ -15764,7 +16889,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_10",
           "false_next" : "node_51"
         },
         {
@@ -15892,7 +17017,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_13",
           "false_next" : "node_65"
         },
         {
@@ -15918,8 +17043,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_69"
         },
         {
           "name" : "node_65",
@@ -15961,8 +17086,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_15",
+          "false_next" : "node_69"
         },
         {
           "name" : "node_67",
@@ -15987,17 +17112,17 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_69"
         },
         {
-          "name" : "node_70",
+          "name" : "node_69",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 328,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
           },
           "expression" : {
             "type" : "expression",
@@ -16010,50 +17135,26 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
                   }
                 }
               },
               "right" : {
                 "type" : "bool",
-                "value" : true
+                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_72"
+          "true_next" : "node_70",
+          "false_next" : "node_74"
         },
         {
-          "name" : "node_72",
+          "name" : "node_70",
           "id" : 27,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_egress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_76"
-        },
-        {
-          "name" : "node_74",
-          "id" : 28,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
-            "column" : 12,
+            "line" : 329,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
           "expression" : {
@@ -16067,7 +17168,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
                   }
                 }
               },
@@ -16077,11 +17178,44 @@
               }
             }
           },
-          "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_76"
+          "true_next" : "tbl_spgw_gtpu_encap",
+          "false_next" : "node_72"
         },
         {
-          "name" : "node_76",
+          "name" : "node_72",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 332,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_74"
+        },
+        {
+          "name" : "node_74",
           "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -16158,10 +17292,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_77"
+          "true_next" : "node_75"
         },
         {
-          "name" : "node_77",
+          "name" : "node_75",
           "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -16180,7 +17314,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source34"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source32"]
                   }
                 }
               },
@@ -16191,10 +17325,10 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_79"
+          "false_next" : "node_77"
         },
         {
-          "name" : "node_79",
+          "name" : "node_77",
           "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
@@ -16214,10 +17348,10 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_21"
+          "true_next" : "tbl_act_18"
         },
         {
-          "name" : "node_82",
+          "name" : "node_80",
           "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16236,7 +17370,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit35"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit33"]
                   }
                 }
               },
@@ -16246,11 +17380,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_22",
-          "false_next" : "node_84"
+          "true_next" : "tbl_act_19",
+          "false_next" : "node_82"
         },
         {
-          "name" : "node_84",
+          "name" : "node_82",
           "id" : 33,
           "expression" : {
             "type" : "expression",
@@ -16274,7 +17408,7 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_88",
+          "name" : "node_86",
           "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16293,11 +17427,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
-          "false_next" : "node_90"
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_88"
         },
         {
-          "name" : "node_90",
+          "name" : "node_88",
           "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16316,11 +17450,11 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_92"
+          "true_next" : "tbl_act_22",
+          "false_next" : "node_90"
         },
         {
-          "name" : "node_92",
+          "name" : "node_90",
           "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
@@ -16340,7 +17474,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_26"
+          "true_next" : "tbl_act_23"
         }
       ]
     }
@@ -16377,7 +17511,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index bb77114..100c35a 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -389,9 +389,9 @@
 }
 tables {
   preamble {
-    id: 33584493
-    name: "FabricIngress.spgw_ingress.interface_lookup"
-    alias: "interface_lookup"
+    id: 33557250
+    name: "FabricIngress.spgw.interfaces"
+    alias: "interfaces"
   }
   match_fields {
     id: 1
@@ -406,16 +406,21 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16797935
+    id: 16810012
   }
-  const_default_action_id: 16797935
+  action_refs {
+    id: 16783042
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16783042
   size: 128
 }
 tables {
   preamble {
-    id: 33586958
-    name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
-    alias: "downlink_pdr_lookup"
+    id: 33566601
+    name: "FabricIngress.spgw.downlink_pdrs"
+    alias: "downlink_pdrs"
   }
   match_fields {
     id: 1
@@ -424,16 +429,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16799934
+    id: 16800614
   }
-  const_default_action_id: 16799934
+  action_refs {
+    id: 16800567
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
   size: 1024
 }
 tables {
   preamble {
-    id: 33587070
-    name: "FabricIngress.spgw_ingress.uplink_pdr_lookup"
-    alias: "uplink_pdr_lookup"
+    id: 33606410
+    name: "FabricIngress.spgw.uplink_pdrs"
+    alias: "uplink_pdrs"
   }
   match_fields {
     id: 1
@@ -448,16 +457,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16799934
+    id: 16800614
   }
-  const_default_action_id: 16799934
+  action_refs {
+    id: 16800567
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
   size: 1024
 }
 tables {
   preamble {
-    id: 33613200
-    name: "FabricIngress.spgw_ingress.far_lookup"
-    alias: "far_lookup"
+    id: 33599560
+    name: "FabricIngress.spgw.fars"
+    alias: "fars"
   }
   match_fields {
     id: 1
@@ -466,12 +479,15 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16834935
+    id: 16820307
   }
   action_refs {
-    id: 16787606
+    id: 16814785
   }
-  const_default_action_id: 16834935
+  action_refs {
+    id: 16814681
+  }
+  const_default_action_id: 16820307
   size: 2048
 }
 tables {
@@ -578,6 +594,13 @@
 }
 actions {
   preamble {
+    id: 16800567
+    name: "NoAction"
+    alias: "NoAction"
+  }
+}
+actions {
+  preamble {
     id: 16778827
     name: "FabricIngress.process_set_source_sink.int_set_source"
     alias: "int_set_source"
@@ -820,31 +843,28 @@
 }
 actions {
   preamble {
-    id: 16797935
-    name: "FabricIngress.spgw_ingress.set_source_iface"
-    alias: "set_source_iface"
+    id: 16810012
+    name: "FabricIngress.spgw.load_iface"
+    alias: "load_iface"
   }
   params {
     id: 1
     name: "src_iface"
     bitwidth: 8
   }
-  params {
-    id: 2
-    name: "direction"
-    bitwidth: 2
-  }
-  params {
-    id: 3
-    name: "skip_spgw"
-    bitwidth: 1
+}
+actions {
+  preamble {
+    id: 16783042
+    name: "FabricIngress.spgw.iface_miss"
+    alias: "iface_miss"
   }
 }
 actions {
   preamble {
-    id: 16799934
-    name: "FabricIngress.spgw_ingress.set_pdr_attributes"
-    alias: "set_pdr_attributes"
+    id: 16800614
+    name: "FabricIngress.spgw.load_pdr"
+    alias: "load_pdr"
   }
   params {
     id: 1
@@ -864,9 +884,9 @@
 }
 actions {
   preamble {
-    id: 16834935
-    name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
-    alias: "load_normal_far_attributes"
+    id: 16820307
+    name: "FabricIngress.spgw.load_normal_far"
+    alias: "load_normal_far"
   }
   params {
     id: 1
@@ -881,9 +901,9 @@
 }
 actions {
   preamble {
-    id: 16787606
-    name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
-    alias: "load_tunnel_far_attributes"
+    id: 16814785
+    name: "FabricIngress.spgw.load_tunnel_far"
+    alias: "load_tunnel_far"
   }
   params {
     id: 1
@@ -918,37 +938,39 @@
 }
 actions {
   preamble {
-    id: 16829280
-    name: "FabricIngress.spgw_ingress.decap_inner_tcp"
-    alias: "decap_inner_tcp"
+    id: 16814681
+    name: "FabricIngress.spgw.load_dbuf_far"
+    alias: "load_dbuf_far"
   }
-}
-actions {
-  preamble {
-    id: 16815878
-    name: "FabricIngress.spgw_ingress.decap_inner_udp"
-    alias: "decap_inner_udp"
+  params {
+    id: 1
+    name: "drop"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16801274
-    name: "FabricIngress.spgw_ingress.decap_inner_icmp"
-    alias: "decap_inner_icmp"
+  params {
+    id: 2
+    name: "notify_cp"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16830582
-    name: "FabricIngress.spgw_ingress.decap_inner_unknown"
-    alias: "decap_inner_unknown"
+  params {
+    id: 3
+    name: "tunnel_src_port"
+    bitwidth: 16
   }
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
+  params {
+    id: 4
+    name: "tunnel_src_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 5
+    name: "tunnel_dst_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 6
+    name: "teid"
+    bitwidth: 32
   }
 }
 actions {
@@ -1032,9 +1054,9 @@
 }
 counters {
   preamble {
-    id: 302029884
-    name: "FabricIngress.spgw_ingress.pdr_counter"
-    alias: "spgw_ingress.pdr_counter"
+    id: 302043952
+    name: "FabricIngress.spgw.pdr_counter"
+    alias: "FabricIngress.spgw.pdr_counter"
   }
   spec {
     unit: BOTH
@@ -1043,9 +1065,9 @@
 }
 counters {
   preamble {
-    id: 302012289
-    name: "FabricEgress.spgw_egress.pdr_counter"
-    alias: "spgw_egress.pdr_counter"
+    id: 302049491
+    name: "FabricEgress.spgw.pdr_counter"
+    alias: "FabricEgress.spgw.pdr_counter"
   }
   spec {
     unit: BOTH
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 18163de..036ea1d 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -4,14 +4,13 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp_0", 16, false],
         ["tmp_1", 16, false],
-        ["tmp_2", 4, false],
+        ["tmp_2", 16, false],
+        ["tmp_3", 4, false],
         ["tmp", 32, false],
-        ["tmp_3", 32, false],
-        ["spgw_ingress_hasReturned", 1, false],
+        ["tmp_0", 32, false],
+        ["spgw_tmp", 1, false],
         ["egress_next_tmp", 1, false],
-        ["spgw_egress_hasReturned", 1, false],
         ["fabric_metadata_t._ip_eth_type0", 16, false],
         ["fabric_metadata_t._vlan_id1", 12, false],
         ["fabric_metadata_t._vlan_pri2", 3, false],
@@ -31,22 +30,20 @@
         ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
         ["fabric_metadata_t._inner_l4_sport17", 16, false],
         ["fabric_metadata_t._inner_l4_dport18", 16, false],
-        ["fabric_metadata_t._spgw_direction19", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len20", 16, false],
-        ["fabric_metadata_t._spgw_teid21", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_src_port22", 16, false],
-        ["fabric_metadata_t._spgw_tunnel_src_addr23", 32, false],
-        ["fabric_metadata_t._spgw_tunnel_dst_addr24", 32, false],
-        ["fabric_metadata_t._spgw_ctr_id25", 32, false],
-        ["fabric_metadata_t._spgw_far_id26", 32, false],
-        ["fabric_metadata_t._spgw_src_iface27", 8, false],
-        ["fabric_metadata_t._spgw_skip_spgw28", 1, false],
-        ["fabric_metadata_t._spgw_pdr_hit29", 1, false],
-        ["fabric_metadata_t._spgw_far_dropped30", 1, false],
-        ["fabric_metadata_t._spgw_notify_spgwc31", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_encap32", 1, false],
-        ["fabric_metadata_t._spgw_needs_gtpu_decap33", 1, false],
-        ["_padding_0", 6, false]
+        ["fabric_metadata_t._spgw_ipv4_len19", 16, false],
+        ["fabric_metadata_t._spgw_teid20", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_src_port21", 16, false],
+        ["fabric_metadata_t._spgw_tunnel_src_addr22", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_dst_addr23", 32, false],
+        ["fabric_metadata_t._spgw_ctr_id24", 32, false],
+        ["fabric_metadata_t._spgw_far_id25", 32, false],
+        ["fabric_metadata_t._spgw_src_iface26", 8, false],
+        ["fabric_metadata_t._spgw_skip_spgw27", 1, false],
+        ["fabric_metadata_t._spgw_notify_spgwc28", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_encap29", 1, false],
+        ["fabric_metadata_t._spgw_needs_gtpu_decap30", 1, false],
+        ["fabric_metadata_t._spgw_skip_egress_pdr_ctr31", 1, false],
+        ["_padding_0", 2, false]
       ]
     },
     {
@@ -467,7 +464,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_1"]
                 },
                 {
                   "type" : "lookahead",
@@ -505,7 +502,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_1"]
             }
           ]
         },
@@ -526,7 +523,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
                   "type" : "lookahead",
@@ -552,7 +549,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_1"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -662,7 +659,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_2"]
+                  "value" : ["scalars", "tmp_3"]
                 },
                 {
                   "type" : "lookahead",
@@ -688,7 +685,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -1178,11 +1175,11 @@
       "is_direct" : false
     },
     {
-      "name" : "FabricIngress.spgw_ingress.pdr_counter",
+      "name" : "FabricIngress.spgw.pdr_counter",
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 180,
+        "line" : 109,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1202,11 +1199,11 @@
       }
     },
     {
-      "name" : "FabricEgress.spgw_egress.pdr_counter",
+      "name" : "FabricEgress.spgw.pdr_counter",
       "id" : 13,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 301,
+        "line" : 286,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -1282,7 +1279,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1445,9 +1442,21 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.filtering.deny",
+      "name" : "NoAction",
       "id" : 7,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 8,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.filtering.deny",
+      "id" : 9,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
@@ -1511,13 +1520,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 8,
+      "id" : 10,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 9,
+      "id" : 11,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -1548,7 +1557,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 10,
+      "id" : 12,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -1579,7 +1588,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 11,
+      "id" : 13,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1610,7 +1619,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 12,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1660,7 +1669,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 13,
+      "id" : 15,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1691,13 +1700,13 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 14,
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.acl.set_next_id_acl",
-      "id" : 15,
+      "id" : 17,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1728,7 +1737,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 16,
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1783,7 +1792,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 17,
+      "id" : 19,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -1814,7 +1823,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 18,
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1865,13 +1874,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 19,
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 20,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -1902,68 +1911,6 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 21,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 31,
-            "column" : 5,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 22,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id9"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 115,
-            "column" : 32,
-            "source_fragment" : "= next_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_hashed",
       "id" : 23,
       "runtime_data" : [
         {
@@ -1994,10 +1941,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.routing_hashed",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
       "id" : 24,
       "runtime_data" : [
         {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id9"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 115,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
+      "id" : 25,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.routing_hashed",
+      "id" : 26,
+      "runtime_data" : [
+        {
           "name" : "port_num",
           "bitwidth" : 9
         },
@@ -2072,7 +2081,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 25,
+      "id" : 27,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2172,7 +2181,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 26,
+      "id" : 28,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -2231,20 +2240,1666 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_source_iface",
-      "id" : 27,
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
+      "id" : 29,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp",
+      "id" : 30,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "id" : 31,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "id" : 32,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_tcp",
+      "id" : 33,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "tcp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_tcp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_udp",
+      "id" : 34,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 59,
+            "column" : 8,
+            "source_fragment" : "hdr.udp = hdr.inner_udp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_icmp",
+      "id" : 35,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 65,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "icmp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 66,
+            "column" : 8,
+            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_icmp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_unknown",
+      "id" : 36,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 118,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 39,
+            "column" : 27,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 42,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 43,
+            "column" : 27,
+            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "ipv4"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 45,
+            "column" : 8,
+            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_iface",
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "src_iface",
           "bitwidth" : 8
-        },
-        {
-          "name" : "direction",
-          "bitwidth" : 2
-        },
-        {
-          "name" : "skip_spgw",
-          "bitwidth" : 1
         }
       ],
       "primitives" : [
@@ -2253,7 +3908,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
             },
             {
               "type" : "runtime_data",
@@ -2262,7 +3917,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 50,
+            "line" : 121,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -2272,26 +3927,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
-            },
-            {
-              "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_spgw28"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
             },
             {
               "type" : "expression",
@@ -2301,18 +3937,8 @@
                   "op" : "b2d",
                   "left" : null,
                   "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 2
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
+                    "type" : "bool",
+                    "value" : false
                   }
                 }
               }
@@ -2320,16 +3946,71 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 52,
+            "line" : 122,
             "column" : 33,
-            "source_fragment" : "= (bool)skip_spgw; ..."
+            "source_fragment" : "= false; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 28,
+      "name" : "FabricIngress.spgw.iface_miss",
+      "id" : 38,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 44,
+            "source_fragment" : "8w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 126,
+            "column" : 33,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2350,36 +4031,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit29"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -2388,7 +4040,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2398,7 +4050,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -2407,7 +4059,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2417,7 +4069,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -2446,7 +4098,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2454,8 +4106,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
-      "id" : 29,
+      "name" : "FabricIngress.spgw.load_pdr",
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -2476,36 +4128,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit29"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 31,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             },
             {
               "type" : "runtime_data",
@@ -2514,7 +4137,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 76,
+            "line" : 151,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -2524,7 +4147,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_id26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id25"]
             },
             {
               "type" : "runtime_data",
@@ -2533,7 +4156,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 77,
+            "line" : 152,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -2543,7 +4166,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
             },
             {
               "type" : "expression",
@@ -2572,7 +4195,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 78,
+            "line" : 153,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
@@ -2580,8 +4203,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
-      "id" : 30,
+      "name" : "FabricIngress.spgw.load_normal_far",
+      "id" : 41,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -2598,7 +4221,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -2627,8 +4250,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 138,
-            "column" : 35,
+            "line" : 186,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -2637,7 +4260,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 187,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -2666,7 +4328,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 139,
+            "line" : 188,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -2674,8 +4336,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
-      "id" : 31,
+      "name" : "FabricIngress.spgw.load_tunnel_far",
+      "id" : 42,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -2708,7 +4370,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
               "type" : "expression",
@@ -2737,8 +4399,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 148,
-            "column" : 35,
+            "line" : 197,
+            "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
         },
@@ -2747,7 +4409,46 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc31"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
             },
             {
               "type" : "expression",
@@ -2776,7 +4477,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 149,
+            "line" : 199,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -2786,7 +4487,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
             },
             {
               "type" : "expression",
@@ -2805,7 +4506,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 201,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -2815,7 +4516,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
             },
             {
               "type" : "runtime_data",
@@ -2824,7 +4525,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 202,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -2834,7 +4535,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
             },
             {
               "type" : "runtime_data",
@@ -2843,7 +4544,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 153,
+            "line" : 203,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -2853,7 +4554,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
             },
             {
               "type" : "runtime_data",
@@ -2862,7 +4563,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 154,
+            "line" : 204,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -2872,7 +4573,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
             },
             {
               "type" : "runtime_data",
@@ -2881,7 +4582,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 155,
+            "line" : 205,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -2900,7 +4601,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 157,
+            "line" : 207,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -2919,7 +4620,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 158,
+            "line" : 208,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -2938,7 +4639,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 159,
+            "line" : 209,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -2957,7 +4658,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 160,
+            "line" : 210,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -2965,27 +4666,72 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_tcp",
-      "id" : 32,
-      "runtime_data" : [],
+      "name" : "FabricIngress.spgw.load_dbuf_far",
+      "id" : 43,
+      "runtime_data" : [
+        {
+          "name" : "drop",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "notify_cp",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "tunnel_src_port",
+          "bitwidth" : 16
+        },
+        {
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "teid",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "filename" : "include/control/spgw.p4",
+            "line" : 197,
+            "column" : 34,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -2993,18 +4739,38 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 198,
+            "column" : 28,
+            "source_fragment" : "= (bool)drop; ..."
           }
         },
         {
@@ -3012,199 +4778,67 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_spgwc28"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 199,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "column" : 36,
+            "source_fragment" : "= (bool)notify_cp; ..."
           }
         },
         {
-          "op" : "assign_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "tcp"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
             },
             {
-              "type" : "header",
-              "value" : "inner_tcp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 200,
-            "column" : 8,
-            "source_fragment" : "hdr.tcp = hdr.inner_tcp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_tcp"
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 201,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_tcp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_udp",
-      "id" : 33,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -3212,18 +4846,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
+              "type" : "runtime_data",
+              "value" : 5
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "line" : 202,
+            "column" : 28,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -3231,18 +4865,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "line" : 203,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -3250,18 +4884,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "line" : 204,
+            "column" : 39,
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -3269,165 +4903,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_udp"
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 205,
-            "column" : 8,
-            "source_fragment" : "hdr.udp = hdr.inner_udp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 206,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_udp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_icmp",
-      "id" : 34,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
-            "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "column" : 39,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3438,15 +4925,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "runtime_data",
+              "value" : 3
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
+            "line" : 207,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+            "source_fragment" : "= tunnel_src_addr; ..."
           }
         },
         {
@@ -3457,15 +4944,15 @@
               "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
+              "type" : "runtime_data",
+              "value" : 4
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 189,
+            "line" : 208,
             "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         },
         {
@@ -3476,15 +4963,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
+              "type" : "runtime_data",
+              "value" : 2
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 190,
+            "line" : 209,
             "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
+            "source_fragment" : "= tunnel_src_port; ..."
           }
         },
         {
@@ -3495,158 +4982,15 @@
               "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
+              "type" : "hexstr",
+              "value" : "0x0868"
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 210,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "icmp"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 211,
-            "column" : 8,
-            "source_fragment" : "hdr.icmp = hdr.inner_icmp"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_icmp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 212,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_icmp.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw_ingress.decap_inner_unknown",
-      "id" : 35,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_proto12"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 187,
             "column" : 27,
-            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+            "source_fragment" : "= 2152; ..."
           }
         },
         {
@@ -3654,146 +4998,35 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
             },
             {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 188,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 189,
-            "column" : 32,
-            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_sport13"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_sport17"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 190,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_sport; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport14"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_l4_dport18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 191,
-            "column" : 27,
-            "source_fragment" : "= fabric_md.inner_l4_dport; ..."
-          }
-        },
-        {
-          "op" : "assign_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "ipv4"
-            },
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "hdr.ipv4 = hdr.inner_ipv4"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "inner_ipv4"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 194,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_ipv4.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "gtpu"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 195,
-            "column" : 8,
-            "source_fragment" : "hdr.gtpu.setInvalid()"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "udp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 216,
-            "column" : 8,
-            "source_fragment" : "hdr.udp.setInvalid()"
+            "line" : 221,
+            "column" : 43,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
     },
     {
       "name" : "act",
-      "id" : 36,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3873,7 +5106,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 37,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3881,7 +5114,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
+              "value" : ["scalars", "spgw_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 46,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_tmp"]
             },
             {
               "type" : "expression",
@@ -3902,44 +5165,8 @@
       ]
     },
     {
-      "name" : "act_1",
-      "id" : 38,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_2",
-      "id" : 39,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3947,17 +5174,17 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricIngress.spgw_ingress.pdr_counter"
+              "value" : "FabricIngress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
+            "line" : 256,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -3965,7 +5192,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 40,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3973,72 +5200,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 281,
-            "column" : 32,
-            "source_fragment" : "= true; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 41,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
             },
             {
               "type" : "field",
@@ -4047,16 +5209,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 273,
+            "column" : 36,
             "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
-      "name" : "act_5",
-      "id" : 42,
+      "name" : "act_4",
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4119,8 +5281,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 43,
+      "name" : "act_5",
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4145,8 +5307,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 44,
+      "name" : "act_6",
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4203,8 +5365,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 45,
+      "name" : "act_7",
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4212,7 +5374,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             },
             {
               "type" : "expression",
@@ -4248,7 +5410,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_0"]
             }
           ],
           "source_info" : {
@@ -4262,13 +5424,13 @@
     },
     {
       "name" : "nop",
-      "id" : 46,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 47,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4309,7 +5471,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 48,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4417,7 +5579,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 116,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -4426,7 +5588,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 49,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4496,7 +5658,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -4524,7 +5686,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 50,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4545,8 +5707,8 @@
       ]
     },
     {
-      "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 51,
+      "name" : "FabricEgress.spgw.gtpu_encap",
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4559,7 +5721,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 306,
+            "line" : 291,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -4578,7 +5740,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 292,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -4597,7 +5759,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 133,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -4616,7 +5778,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 294,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -4635,7 +5797,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 310,
+            "line" : 295,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -4677,7 +5839,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 311,
+            "line" : 296,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -4696,7 +5858,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 298,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -4715,7 +5877,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 299,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -4734,7 +5896,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 315,
+            "line" : 300,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -4753,7 +5915,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 146,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -4772,7 +5934,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 140,
+            "line" : 130,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4786,12 +5948,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr23"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr22"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 303,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -4805,12 +5967,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr23"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 304,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -4829,7 +5991,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 320,
+            "line" : 305,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -4844,7 +6006,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 322,
+            "line" : 307,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -4858,12 +6020,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port22"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_port21"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 323,
+            "line" : 308,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -4882,7 +6044,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 309,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -4906,7 +6068,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4924,7 +6086,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 310,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -4943,7 +6105,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -4958,7 +6120,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -4977,7 +6139,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -4996,7 +6158,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 317,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -5015,7 +6177,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -5034,7 +6196,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 334,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -5053,7 +6215,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 335,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -5072,7 +6234,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 336,
+            "line" : 321,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -5091,7 +6253,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 322,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -5105,12 +6267,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len19"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 338,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -5124,12 +6286,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid20"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -5137,8 +6299,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 52,
+      "name" : "act_8",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5154,8 +6316,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 53,
+      "name" : "act_9",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5205,8 +6367,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 54,
+      "name" : "act_10",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5227,8 +6389,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 55,
+      "name" : "act_11",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5257,8 +6419,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 56,
+      "name" : "act_12",
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5287,8 +6449,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 57,
+      "name" : "act_13",
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5309,8 +6471,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 58,
+      "name" : "act_14",
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5358,8 +6520,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 59,
+      "name" : "act_15",
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5380,8 +6542,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 60,
+      "name" : "act_16",
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5429,74 +6591,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 61,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 62,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_egress_hasReturned"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 63,
+      "name" : "act_17",
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5504,17 +6600,17 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "FabricEgress.spgw_egress.pdr_counter"
+              "value" : "FabricEgress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id24"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
+            "line" : 333,
+            "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
@@ -5549,50 +6645,27 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36],
+          "action_ids" : [44],
           "actions" : ["act"],
-          "base_default_next" : "tbl_act_0",
+          "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
-            "act" : "tbl_act_0"
+            "act" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_0",
+          "name" : "FabricIngress.spgw.interfaces",
           "id" : 1,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [37],
-          "actions" : ["act_0"],
-          "base_default_next" : "FabricIngress.spgw_ingress.interface_lookup",
-          "next_tables" : {
-            "act_0" : "FabricIngress.spgw_ingress.interface_lookup"
-          },
-          "default_entry" : {
-            "action_id" : 37,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.interface_lookup",
-          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 55,
+            "line" : 130,
             "column" : 10,
-            "source_fragment" : "interface_lookup"
+            "source_fragment" : "interfaces"
           },
           "key" : [
             {
@@ -5614,40 +6687,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27],
-          "actions" : ["FabricIngress.spgw_ingress.set_source_iface"],
-          "base_default_next" : "node_6",
+          "action_ids" : [37, 38],
+          "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.spgw_ingress.set_source_iface" : "node_6"
-          },
-          "default_entry" : {
-            "action_id" : 27,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x1"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [38],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_8",
-          "next_tables" : {
-            "act_1" : "node_8"
+            "__HIT__" : "tbl_act_0",
+            "__MISS__" : "tbl_act_1"
           },
           "default_entry" : {
             "action_id" : 38,
@@ -5657,92 +6702,8 @@
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "id" : 4,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 93,
-            "column" : 10,
-            "source_fragment" : "uplink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "tunnel_ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "teid",
-              "target" : ["gtpu", "teid"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [29],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 29,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 82,
-            "column" : 10,
-            "source_fragment" : "downlink_pdr_lookup"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "ue_addr",
-              "target" : ["ipv4", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [28],
-          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
-          "base_default_next" : "tbl_act_2",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_2"
-          },
-          "default_entry" : {
-            "action_id" : 28,
-            "action_const" : true,
-            "action_data" : ["0x0", "0x0", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_2",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 263,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
+          "name" : "tbl_act_0",
+          "id" : 2,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5750,25 +6711,48 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_13",
+          "action_ids" : [45],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_7",
           "next_tables" : {
-            "act_2" : "node_13"
+            "act_0" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "id" : 7,
+          "name" : "tbl_act_1",
+          "id" : 3,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [46],
+          "actions" : ["act_1"],
+          "base_default_next" : "node_7",
+          "next_tables" : {
+            "act_1" : "node_7"
+          },
+          "default_entry" : {
+            "action_id" : 46,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 75,
             "column" : 10,
             "source_fragment" : "decap_gtpu"
           },
@@ -5798,17 +6782,17 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 33, 34, 35],
-          "actions" : ["FabricIngress.spgw_ingress.decap_inner_tcp", "FabricIngress.spgw_ingress.decap_inner_udp", "FabricIngress.spgw_ingress.decap_inner_icmp", "FabricIngress.spgw_ingress.decap_inner_unknown"],
-          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "action_ids" : [29, 30, 31, 32],
+          "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
+          "base_default_next" : "node_10",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.decap_inner_tcp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_udp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_icmp" : "FabricIngress.spgw_ingress.far_lookup",
-            "FabricIngress.spgw_ingress.decap_inner_unknown" : "FabricIngress.spgw_ingress.far_lookup"
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_10",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 35,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5817,7 +6801,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 233,
+                "line" : 89,
                 "column" : 12,
                 "source_fragment" : "(true, false, false) : decap_inner_tcp()"
               },
@@ -5836,7 +6820,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 32,
+                "action_id" : 29,
                 "action_data" : []
               },
               "priority" : 1
@@ -5844,7 +6828,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 234,
+                "line" : 90,
                 "column" : 12,
                 "source_fragment" : "(false, true, false) : decap_inner_udp()"
               },
@@ -5863,7 +6847,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 33,
+                "action_id" : 30,
                 "action_data" : []
               },
               "priority" : 2
@@ -5871,7 +6855,7 @@
             {
               "source_info" : {
                 "filename" : "include/control/spgw.p4",
-                "line" : 235,
+                "line" : 91,
                 "column" : 12,
                 "source_fragment" : "(false, false, true) : decap_inner_icmp()"
               },
@@ -5890,7 +6874,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 34,
+                "action_id" : 31,
                 "action_data" : []
               },
               "priority" : 3
@@ -5898,19 +6882,262 @@
           ]
         },
         {
-          "name" : "FabricIngress.spgw_ingress.far_lookup",
+          "name" : "FabricIngress.spgw.uplink_pdrs",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 168,
+            "column" : 10,
+            "source_fragment" : "uplink_pdrs"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "teid",
+              "target" : ["gtpu", "teid"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [40, 8],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 8,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.downlink_pdrs",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 157,
+            "column" : 10,
+            "source_fragment" : "downlink_pdrs"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [39, 7],
+          "actions" : ["FabricIngress.spgw.load_pdr", "NoAction"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_13",
+            "NoAction" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 7,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 256,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [47],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_15",
+          "next_tables" : {
+            "act_2" : "node_15"
+          },
+          "default_entry" : {
+            "action_id" : 47,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 163,
+            "line" : 75,
             "column" : 10,
-            "source_fragment" : "far_lookup"
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [33, 34, 35, 36],
+          "actions" : ["FabricIngress.spgw.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu.decap_inner_udp", "FabricIngress.spgw.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu.decap_inner_unknown"],
+          "base_default_next" : "FabricIngress.spgw.fars",
+          "next_tables" : {
+            "FabricIngress.spgw.decap_gtpu.decap_inner_tcp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_udp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_icmp" : "FabricIngress.spgw.fars",
+            "FabricIngress.spgw.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw.fars"
+          },
+          "default_entry" : {
+            "action_id" : 36,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 89,
+                "column" : 12,
+                "source_fragment" : "(true, false, false) : decap_inner_tcp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 33,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 90,
+                "column" : 12,
+                "source_fragment" : "(false, true, false) : decap_inner_udp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 34,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "column" : 12,
+                "source_fragment" : "(false, false, true) : decap_inner_icmp()"
+              },
+              "match_key" : [
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x00"
+                },
+                {
+                  "match_type" : "exact",
+                  "key" : "0x01"
+                }
+              ],
+              "action_entry" : {
+                "action_id" : 35,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw.fars",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 224,
+            "column" : 10,
+            "source_fragment" : "fars"
           },
           "key" : [
             {
               "match_type" : "exact",
               "name" : "far_id",
-              "target" : ["scalars", "fabric_metadata_t._spgw_far_id26"],
+              "target" : ["scalars", "fabric_metadata_t._spgw_far_id25"],
               "mask" : null
             }
           ],
@@ -5920,56 +7147,28 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [30, 31],
-          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
-          "base_default_next" : "node_16",
+          "action_ids" : [41, 42, 43],
+          "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
+          "base_default_next" : "tbl_act_3",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_16",
-            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_16"
+            "FabricIngress.spgw.load_normal_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_act_3",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_act_3"
           },
           "default_entry" : {
-            "action_id" : 30,
+            "action_id" : 41,
             "action_const" : true,
-            "action_data" : ["0x1", "0x1"],
+            "action_data" : ["0x1", "0x0"],
             "action_entry_const" : true
           }
         },
         {
           "name" : "tbl_act_3",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 280,
-            "column" : 38,
-            "source_fragment" : "= true; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_3"],
-          "base_default_next" : "tbl_act_4",
-          "next_tables" : {
-            "act_3" : "tbl_act_4"
-          },
-          "default_entry" : {
-            "action_id" : 40,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_4",
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 289,
-            "column" : 32,
+            "line" : 273,
+            "column" : 36,
             "source_fragment" : "="
           },
           "key" : [],
@@ -5979,21 +7178,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_4"],
+          "action_ids" : [48],
+          "actions" : ["act_3"],
           "base_default_next" : "node_19",
           "next_tables" : {
-            "act_4" : "node_19"
+            "act_3" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_4",
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -6008,21 +7207,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_5"],
+          "action_ids" : [49],
+          "actions" : ["act_4"],
           "base_default_next" : "node_21",
           "next_tables" : {
-            "act_5" : "node_21"
+            "act_4" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
+          "name" : "tbl_act_5",
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
@@ -6037,14 +7236,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_6"],
+          "action_ids" : [50],
+          "actions" : ["act_5"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_5" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6085,7 +7284,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [7, 8, 9],
+          "action_ids" : [9, 10, 11],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -6094,7 +7293,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 7,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6141,14 +7340,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [10],
+          "action_ids" : [12],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_25",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_25"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -6183,7 +7382,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11, 0],
+          "action_ids" : [13, 0],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -6220,7 +7419,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12, 1],
+          "action_ids" : [14, 1],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -6257,7 +7456,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 14, 2],
+          "action_ids" : [15, 16, 2],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -6361,7 +7560,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 16, 17, 18, 19],
+          "action_ids" : [17, 18, 19, 20, 21],
           "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_33",
           "next_tables" : {
@@ -6372,7 +7571,7 @@
             "FabricIngress.acl.nop_acl" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 19,
+            "action_id" : 21,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6407,7 +7606,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 22, 4],
+          "action_ids" : [23, 24, 4],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -6446,7 +7645,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 24, 25, 5],
+          "action_ids" : [25, 26, 27, 5],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -6479,7 +7678,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [26, 6],
+          "action_ids" : [28, 6],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -6516,7 +7715,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [20, 3],
+          "action_ids" : [22, 3],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
           "base_default_next" : "node_38",
           "next_tables" : {
@@ -6531,7 +7730,7 @@
           }
         },
         {
-          "name" : "tbl_act_7",
+          "name" : "tbl_act_6",
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -6546,21 +7745,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_7"],
+          "action_ids" : [51],
+          "actions" : ["act_6"],
           "base_default_next" : "node_40",
           "next_tables" : {
-            "act_7" : "node_40"
+            "act_6" : "node_40"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_8",
+          "name" : "tbl_act_7",
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
@@ -6575,14 +7774,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_8"],
+          "action_ids" : [52],
+          "actions" : ["act_7"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_8" : null
+            "act_7" : null
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6649,72 +7848,58 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "tbl_act_0"
+          "false_next" : "FabricIngress.spgw.interfaces"
         },
         {
-          "name" : "node_6",
+          "name" : "node_7",
           "id" : 1,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "spgw_tmp"]
+              }
+            }
+          },
+          "true_next" : "node_8",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_8",
+          "id" : 2,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 249,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "line" : 246,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
               "op" : "==",
               "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
-                  }
-                }
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
               },
               "right" : {
-                "type" : "bool",
-                "value" : true
+                "type" : "hexstr",
+                "value" : "0x03"
               }
             }
           },
-          "true_next" : "tbl_act_1",
-          "false_next" : "node_8"
+          "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "false_next" : "node_10"
         },
         {
-          "name" : "node_8",
-          "id" : 2,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_9",
-          "false_next" : "node_19"
-        },
-        {
-          "name" : "node_9",
+          "name" : "node_10",
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 253,
-            "column" : 12,
+            "line" : 250,
+            "column" : 16,
             "source_fragment" : "hdr.gtpu.isValid()"
           },
           "expression" : {
@@ -6728,16 +7913,42 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
-          "false_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup"
+          "true_next" : "FabricIngress.spgw.uplink_pdrs",
+          "false_next" : "FabricIngress.spgw.downlink_pdrs"
         },
         {
           "name" : "node_13",
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 266,
-            "column" : 12,
+            "line" : 255,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_src_iface26"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_15"
+        },
+        {
+          "name" : "node_15",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 260,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_decap == true"
           },
           "expression" : {
@@ -6751,7 +7962,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap33"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_decap30"]
                   }
                 }
               },
@@ -6761,41 +7972,8 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.decap_gtpu",
-          "false_next" : "FabricIngress.spgw_ingress.far_lookup"
-        },
-        {
-          "name" : "node_16",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 277,
-            "column" : 12,
-            "source_fragment" : "fabric_md.spgw.far_dropped == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped30"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_3",
-          "false_next" : "tbl_act_4"
+          "true_next" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
+          "false_next" : "FabricIngress.spgw.fars"
         },
         {
           "name" : "node_19",
@@ -6817,7 +7995,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_5",
+          "true_next" : "tbl_act_4",
           "false_next" : "node_21"
         },
         {
@@ -6847,7 +8025,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_6",
+          "true_next" : "tbl_act_5",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -7017,7 +8195,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
+          "true_next" : "tbl_act_6",
           "false_next" : "node_40"
         },
         {
@@ -7044,7 +8222,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_8"
+          "true_next" : "tbl_act_7"
         }
       ]
     },
@@ -7060,7 +8238,7 @@
       "init_table" : "node_44",
       "tables" : [
         {
-          "name" : "tbl_act_9",
+          "name" : "tbl_act_8",
           "id" : 25,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -7075,21 +8253,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_9"],
+          "action_ids" : [59],
+          "actions" : ["act_8"],
           "base_default_next" : "node_46",
           "next_tables" : {
-            "act_9" : "node_46"
+            "act_8" : "node_46"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
+          "name" : "tbl_act_9",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
@@ -7104,21 +8282,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_10"],
+          "action_ids" : [60],
+          "actions" : ["act_9"],
           "base_default_next" : "node_48",
           "next_tables" : {
-            "act_10" : "node_48"
+            "act_9" : "node_48"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
+          "name" : "tbl_act_10",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7133,14 +8311,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["act_11"],
+          "action_ids" : [61],
+          "actions" : ["act_10"],
           "base_default_next" : "node_50",
           "next_tables" : {
-            "act_11" : "node_50"
+            "act_10" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7162,14 +8340,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [54],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7191,14 +8369,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [55],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7233,22 +8411,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50, 46],
+          "action_ids" : [57, 53],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_12",
-            "__MISS__" : "tbl_act_13"
+            "__HIT__" : "tbl_act_11",
+            "__MISS__" : "tbl_act_12"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
+          "name" : "tbl_act_11",
           "id" : 31,
           "key" : [],
           "match_type" : "exact",
@@ -7257,21 +8435,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_12"],
+          "action_ids" : [62],
+          "actions" : ["act_11"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_12" : "node_57"
+            "act_11" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
+          "name" : "tbl_act_12",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -7280,14 +8458,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["act_13"],
+          "action_ids" : [63],
+          "actions" : ["act_12"],
           "base_default_next" : "node_57",
           "next_tables" : {
-            "act_13" : "node_57"
+            "act_12" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7309,21 +8487,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
+          "action_ids" : [56],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "node_60",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "node_60"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
+          "name" : "tbl_act_13",
           "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7338,21 +8516,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_15"],
+          "action_ids" : [65],
+          "actions" : ["act_14"],
           "base_default_next" : "node_62",
           "next_tables" : {
-            "act_15" : "node_62"
+            "act_14" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 65,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
+          "name" : "tbl_act_14",
           "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7367,21 +8545,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
-          "actions" : ["act_14"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [64],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_14" : "tbl_act_18"
+            "act_13" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_act_15",
           "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7396,21 +8574,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
-          "actions" : ["act_17"],
+          "action_ids" : [67],
+          "actions" : ["act_16"],
           "base_default_next" : "node_66",
           "next_tables" : {
-            "act_17" : "node_66"
+            "act_16" : "node_66"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 67,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_16",
           "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
@@ -7425,107 +8603,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_16"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [66],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_16" : "tbl_act_18"
+            "act_15" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 66,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "tbl_spgw_gtpu_encap",
           "id" : 38,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_69",
-          "next_tables" : {
-            "act_19" : "node_69"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_19",
-          "id" : 39,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
-            "column" : 46,
-            "source_fragment" : "return"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_71",
-          "next_tables" : {
-            "act_18" : "node_71"
-          },
-          "default_entry" : {
-            "action_id" : 61,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 40,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 344,
-            "column" : 8,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_73",
-          "next_tables" : {
-            "act_20" : "node_73"
-          },
-          "default_entry" : {
-            "action_id" : 63,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 41,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 347,
-            "column" : 12,
+            "line" : 330,
+            "column" : 16,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -7535,14 +8632,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : null,
+          "action_ids" : [58],
+          "actions" : ["FabricEgress.spgw.gtpu_encap"],
+          "base_default_next" : "node_71",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : null
+            "FabricEgress.spgw.gtpu_encap" : "node_71"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 58,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 39,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 333,
+            "column" : 16,
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [68],
+          "actions" : ["act_17"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "act_17" : null
+          },
+          "default_entry" : {
+            "action_id" : 68,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7581,7 +8707,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_9",
+          "true_next" : "tbl_act_8",
           "false_next" : "node_46"
         },
         {
@@ -7607,7 +8733,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
+          "true_next" : "tbl_act_9",
           "false_next" : "node_48"
         },
         {
@@ -7660,7 +8786,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
+          "true_next" : "tbl_act_10",
           "false_next" : "node_50"
         },
         {
@@ -7788,7 +8914,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_13",
           "false_next" : "node_64"
         },
         {
@@ -7814,8 +8940,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_68"
         },
         {
           "name" : "node_64",
@@ -7857,8 +8983,8 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_15",
+          "false_next" : "node_68"
         },
         {
           "name" : "node_66",
@@ -7883,17 +9009,17 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "tbl_act_18"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_68"
         },
         {
-          "name" : "node_69",
+          "name" : "node_68",
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 343,
+            "line" : 328,
             "column" : 12,
-            "source_fragment" : "fabric_md.spgw.skip_spgw == true"
+            "source_fragment" : "fabric_md.spgw.skip_spgw == false"
           },
           "expression" : {
             "type" : "expression",
@@ -7906,50 +9032,26 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw28"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_spgw27"]
                   }
                 }
               },
               "right" : {
                 "type" : "bool",
-                "value" : true
-              }
-            }
-          },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_71"
-        },
-        {
-          "name" : "node_71",
-          "id" : 27,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "spgw_egress_hasReturned"]
-                  }
-                }
+                "value" : false
               }
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_20"
+          "true_next" : "node_69"
         },
         {
-          "name" : "node_73",
-          "id" : 28,
+          "name" : "node_69",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 346,
-            "column" : 12,
+            "line" : 329,
+            "column" : 16,
             "source_fragment" : "fabric_md.spgw.needs_gtpu_encap == true"
           },
           "expression" : {
@@ -7963,7 +9065,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap32"]
+                    "value" : ["scalars", "fabric_metadata_t._spgw_needs_gtpu_encap29"]
                   }
                 }
               },
@@ -7973,8 +9075,41 @@
               }
             }
           },
+          "true_next" : "tbl_spgw_gtpu_encap",
+          "false_next" : "node_71"
+        },
+        {
+          "name" : "node_71",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 332,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_skip_egress_pdr_ctr31"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
           "false_next" : null,
-          "true_next" : "tbl_spgw_egress_gtpu_encap"
+          "true_next" : "tbl_act_17"
         }
       ]
     }
@@ -8011,7 +9146,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 362,
+        "line" : 349,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index 0db6431..13a2236 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -365,9 +365,9 @@
 }
 tables {
   preamble {
-    id: 33584493
-    name: "FabricIngress.spgw_ingress.interface_lookup"
-    alias: "interface_lookup"
+    id: 33557250
+    name: "FabricIngress.spgw.interfaces"
+    alias: "interfaces"
   }
   match_fields {
     id: 1
@@ -382,16 +382,21 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16797935
+    id: 16810012
   }
-  const_default_action_id: 16797935
+  action_refs {
+    id: 16783042
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16783042
   size: 128
 }
 tables {
   preamble {
-    id: 33586958
-    name: "FabricIngress.spgw_ingress.downlink_pdr_lookup"
-    alias: "downlink_pdr_lookup"
+    id: 33566601
+    name: "FabricIngress.spgw.downlink_pdrs"
+    alias: "downlink_pdrs"
   }
   match_fields {
     id: 1
@@ -400,16 +405,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16799934
+    id: 16800614
   }
-  const_default_action_id: 16799934
+  action_refs {
+    id: 16800567
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
   size: 1024
 }
 tables {
   preamble {
-    id: 33587070
-    name: "FabricIngress.spgw_ingress.uplink_pdr_lookup"
-    alias: "uplink_pdr_lookup"
+    id: 33606410
+    name: "FabricIngress.spgw.uplink_pdrs"
+    alias: "uplink_pdrs"
   }
   match_fields {
     id: 1
@@ -424,16 +433,20 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16799934
+    id: 16800614
   }
-  const_default_action_id: 16799934
+  action_refs {
+    id: 16800567
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
   size: 1024
 }
 tables {
   preamble {
-    id: 33613200
-    name: "FabricIngress.spgw_ingress.far_lookup"
-    alias: "far_lookup"
+    id: 33599560
+    name: "FabricIngress.spgw.fars"
+    alias: "fars"
   }
   match_fields {
     id: 1
@@ -442,12 +455,15 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16834935
+    id: 16820307
   }
   action_refs {
-    id: 16787606
+    id: 16814785
   }
-  const_default_action_id: 16834935
+  action_refs {
+    id: 16814681
+  }
+  const_default_action_id: 16820307
   size: 2048
 }
 tables {
@@ -489,6 +505,13 @@
 }
 actions {
   preamble {
+    id: 16800567
+    name: "NoAction"
+    alias: "NoAction"
+  }
+}
+actions {
+  preamble {
     id: 16836487
     name: "FabricIngress.filtering.deny"
     alias: "deny"
@@ -724,31 +747,28 @@
 }
 actions {
   preamble {
-    id: 16797935
-    name: "FabricIngress.spgw_ingress.set_source_iface"
-    alias: "set_source_iface"
+    id: 16810012
+    name: "FabricIngress.spgw.load_iface"
+    alias: "load_iface"
   }
   params {
     id: 1
     name: "src_iface"
     bitwidth: 8
   }
-  params {
-    id: 2
-    name: "direction"
-    bitwidth: 2
-  }
-  params {
-    id: 3
-    name: "skip_spgw"
-    bitwidth: 1
+}
+actions {
+  preamble {
+    id: 16783042
+    name: "FabricIngress.spgw.iface_miss"
+    alias: "iface_miss"
   }
 }
 actions {
   preamble {
-    id: 16799934
-    name: "FabricIngress.spgw_ingress.set_pdr_attributes"
-    alias: "set_pdr_attributes"
+    id: 16800614
+    name: "FabricIngress.spgw.load_pdr"
+    alias: "load_pdr"
   }
   params {
     id: 1
@@ -768,9 +788,9 @@
 }
 actions {
   preamble {
-    id: 16834935
-    name: "FabricIngress.spgw_ingress.load_normal_far_attributes"
-    alias: "load_normal_far_attributes"
+    id: 16820307
+    name: "FabricIngress.spgw.load_normal_far"
+    alias: "load_normal_far"
   }
   params {
     id: 1
@@ -785,9 +805,9 @@
 }
 actions {
   preamble {
-    id: 16787606
-    name: "FabricIngress.spgw_ingress.load_tunnel_far_attributes"
-    alias: "load_tunnel_far_attributes"
+    id: 16814785
+    name: "FabricIngress.spgw.load_tunnel_far"
+    alias: "load_tunnel_far"
   }
   params {
     id: 1
@@ -822,30 +842,39 @@
 }
 actions {
   preamble {
-    id: 16829280
-    name: "FabricIngress.spgw_ingress.decap_inner_tcp"
-    alias: "decap_inner_tcp"
+    id: 16814681
+    name: "FabricIngress.spgw.load_dbuf_far"
+    alias: "load_dbuf_far"
   }
-}
-actions {
-  preamble {
-    id: 16815878
-    name: "FabricIngress.spgw_ingress.decap_inner_udp"
-    alias: "decap_inner_udp"
+  params {
+    id: 1
+    name: "drop"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16801274
-    name: "FabricIngress.spgw_ingress.decap_inner_icmp"
-    alias: "decap_inner_icmp"
+  params {
+    id: 2
+    name: "notify_cp"
+    bitwidth: 1
   }
-}
-actions {
-  preamble {
-    id: 16830582
-    name: "FabricIngress.spgw_ingress.decap_inner_unknown"
-    alias: "decap_inner_unknown"
+  params {
+    id: 3
+    name: "tunnel_src_port"
+    bitwidth: 16
+  }
+  params {
+    id: 4
+    name: "tunnel_src_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 5
+    name: "tunnel_dst_addr"
+    bitwidth: 32
+  }
+  params {
+    id: 6
+    name: "teid"
+    bitwidth: 32
   }
 }
 actions {
@@ -890,9 +919,9 @@
 }
 counters {
   preamble {
-    id: 302029884
-    name: "FabricIngress.spgw_ingress.pdr_counter"
-    alias: "spgw_ingress.pdr_counter"
+    id: 302043952
+    name: "FabricIngress.spgw.pdr_counter"
+    alias: "FabricIngress.spgw.pdr_counter"
   }
   spec {
     unit: BOTH
@@ -901,9 +930,9 @@
 }
 counters {
   preamble {
-    id: 302012289
-    name: "FabricEgress.spgw_egress.pdr_counter"
-    alias: "spgw_egress.pdr_counter"
+    id: 302049491
+    name: "FabricEgress.spgw.pdr_counter"
+    alias: "FabricEgress.spgw.pdr_counter"
   }
   spec {
     unit: BOTH
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 972af8e..2143288 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -2387,7 +2387,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 116,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -2466,7 +2466,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java
index a0e6194..7ee9c88 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/FabricInterpreterTest.java
@@ -28,6 +28,7 @@
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java
index 18cd132..1372a25 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricFilteringPipelinerTest.java
@@ -38,7 +38,7 @@
 import org.onosproject.net.flowobjective.ObjectiveError;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java
index 3d2942f..4c554a9 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricForwardingPipelineTest.java
@@ -46,7 +46,7 @@
 import org.onosproject.net.pi.model.PiTableId;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.List;
 
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java
index a7d03c2..ffe6221 100644
--- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java
+++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricNextPipelinerTest.java
@@ -39,7 +39,7 @@
 import org.onosproject.net.pi.runtime.PiActionParam;
 import org.onosproject.net.pi.runtime.PiActionProfileGroupId;
 import org.onosproject.net.pi.runtime.PiGroupKey;
-import org.onosproject.pipelines.fabric.impl.behaviour.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.List;
 import java.util.stream.Collectors;