[SDFAB-357] Backport slicing in fabric and add support for QFI in PDR and fabric

Change-Id: Ieb10140dc0029a0cbf59ddfbb77f64f9a8c7379e
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 b767fbf..cb1372c 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
@@ -9,6 +9,7 @@
         ["tmp_4", 8, false],
         ["tmp_8", 32, false],
         ["last_ipv4_dscp_0", 6, false],
+        ["gtpu_ext_len_0", 8, false],
         ["tmp_1", 16, false],
         ["tmp_3", 16, false],
         ["tmp_5", 4, false],
@@ -16,65 +17,77 @@
         ["tmp_7", 64, false],
         ["tmp_9", 32, false],
         ["tmp_10", 32, false],
-        ["acl_ipv4_src", 32, false],
-        ["acl_ipv4_dst", 32, false],
-        ["acl_ip_proto", 8, false],
-        ["acl_l4_sport", 16, false],
-        ["acl_l4_dport", 16, false],
+        ["tmp_11", 32, false],
         ["bng_ingress_upstream_hasReturned", 1, false],
         ["key_0", 64, false],
+        ["dscp_rewriter_tmp_dscp", 6, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["userMetadata._ip_eth_type0", 16, false],
-        ["userMetadata._vlan_id1", 12, false],
-        ["userMetadata._vlan_pri2", 3, false],
-        ["userMetadata._vlan_cfi3", 1, false],
-        ["userMetadata._push_double_vlan4", 1, false],
-        ["userMetadata._inner_vlan_id5", 12, false],
-        ["userMetadata._inner_vlan_pri6", 3, false],
-        ["userMetadata._inner_vlan_cfi7", 1, false],
-        ["userMetadata._mpls_label8", 20, false],
-        ["userMetadata._mpls_ttl9", 8, false],
-        ["userMetadata._skip_forwarding10", 1, false],
-        ["userMetadata._skip_next11", 1, false],
-        ["userMetadata._fwd_type12", 3, false],
-        ["userMetadata._next_id13", 32, false],
-        ["userMetadata._is_multicast14", 1, false],
-        ["userMetadata._is_controller_packet_out15", 1, false],
-        ["userMetadata._ip_proto16", 8, false],
-        ["userMetadata._l4_sport17", 16, false],
-        ["userMetadata._l4_dport18", 16, false],
-        ["userMetadata._ipv4_src_addr19", 32, false],
-        ["userMetadata._ipv4_dst_addr20", 32, false],
-        ["userMetadata._inner_l4_sport21", 16, false],
-        ["userMetadata._inner_l4_dport22", 16, false],
-        ["userMetadata._spgw_ipv4_len23", 16, false],
-        ["userMetadata._spgw_teid24", 32, false],
-        ["userMetadata._spgw_tunnel_src_port25", 16, false],
-        ["userMetadata._spgw_tunnel_src_addr26", 32, false],
-        ["userMetadata._spgw_tunnel_dst_addr27", 32, false],
-        ["userMetadata._spgw_ctr_id28", 32, false],
-        ["userMetadata._spgw_far_id29", 32, false],
-        ["userMetadata._spgw_src_iface30", 8, false],
-        ["userMetadata._spgw_skip_spgw31", 1, false],
-        ["userMetadata._spgw_notify_spgwc32", 1, false],
-        ["userMetadata._spgw_needs_gtpu_encap33", 1, false],
-        ["userMetadata._spgw_needs_gtpu_decap34", 1, false],
-        ["userMetadata._spgw_skip_egress_pdr_ctr35", 1, false],
-        ["userMetadata._bng_type36", 2, false],
-        ["userMetadata._bng_line_id37", 32, false],
-        ["userMetadata._bng_pppoe_session_id38", 16, false],
-        ["userMetadata._bng_ds_meter_result39", 32, false],
-        ["userMetadata._bng_s_tag40", 12, false],
-        ["userMetadata._bng_c_tag41", 12, false],
-        ["userMetadata._int_meta_source42", 1, false],
-        ["userMetadata._int_meta_transit43", 1, false],
-        ["userMetadata._int_meta_sink44", 1, false],
-        ["userMetadata._int_meta_switch_id45", 32, false],
-        ["userMetadata._int_meta_new_words46", 8, false],
-        ["userMetadata._int_meta_new_bytes47", 16, false],
-        ["userMetadata._int_meta_ig_tstamp48", 32, false],
-        ["userMetadata._int_meta_eg_tstamp49", 32, false],
-        ["userMetadata._port_type50", 2, false]
+        ["userMetadata._lkp_is_ipv40", 1, false],
+        ["userMetadata._lkp_ipv4_src1", 32, false],
+        ["userMetadata._lkp_ipv4_dst2", 32, false],
+        ["userMetadata._lkp_ip_proto3", 8, false],
+        ["userMetadata._lkp_l4_sport4", 16, false],
+        ["userMetadata._lkp_l4_dport5", 16, false],
+        ["userMetadata._lkp_icmp_type6", 8, false],
+        ["userMetadata._lkp_icmp_code7", 8, false],
+        ["userMetadata._ip_eth_type8", 16, false],
+        ["userMetadata._vlan_id9", 12, false],
+        ["userMetadata._vlan_pri10", 3, false],
+        ["userMetadata._vlan_cfi11", 1, false],
+        ["userMetadata._push_double_vlan12", 1, false],
+        ["userMetadata._inner_vlan_id13", 12, false],
+        ["userMetadata._inner_vlan_pri14", 3, false],
+        ["userMetadata._inner_vlan_cfi15", 1, false],
+        ["userMetadata._mpls_label16", 20, false],
+        ["userMetadata._mpls_ttl17", 8, false],
+        ["userMetadata._skip_forwarding18", 1, false],
+        ["userMetadata._skip_next19", 1, false],
+        ["userMetadata._fwd_type20", 3, false],
+        ["userMetadata._next_id21", 32, false],
+        ["userMetadata._is_multicast22", 1, false],
+        ["userMetadata._is_controller_packet_out23", 1, false],
+        ["userMetadata._ip_proto24", 8, false],
+        ["userMetadata._l4_sport25", 16, false],
+        ["userMetadata._l4_dport26", 16, false],
+        ["userMetadata._ipv4_src_addr27", 32, false],
+        ["userMetadata._ipv4_dst_addr28", 32, false],
+        ["userMetadata._slice_id29", 4, false],
+        ["userMetadata._packet_color30", 2, false],
+        ["userMetadata._tc31", 2, false],
+        ["userMetadata._dscp32", 6, false],
+        ["userMetadata._inner_l4_sport33", 16, false],
+        ["userMetadata._inner_l4_dport34", 16, false],
+        ["userMetadata._spgw_ipv4_len35", 16, false],
+        ["userMetadata._spgw_teid36", 32, false],
+        ["userMetadata._spgw_tunnel_src_port37", 16, false],
+        ["userMetadata._spgw_tunnel_src_addr38", 32, false],
+        ["userMetadata._spgw_tunnel_dst_addr39", 32, false],
+        ["userMetadata._spgw_ctr_id40", 32, false],
+        ["userMetadata._spgw_far_id41", 32, false],
+        ["userMetadata._spgw_src_iface42", 8, false],
+        ["userMetadata._spgw_qfi43", 6, false],
+        ["userMetadata._spgw_skip_spgw44", 1, false],
+        ["userMetadata._spgw_notify_spgwc45", 1, false],
+        ["userMetadata._spgw_needs_gtpu_encap46", 1, false],
+        ["userMetadata._spgw_needs_gtpu_decap47", 1, false],
+        ["userMetadata._spgw_skip_egress_pdr_ctr48", 1, false],
+        ["userMetadata._spgw_needs_qfi_push49", 1, false],
+        ["userMetadata._bng_type50", 2, false],
+        ["userMetadata._bng_line_id51", 32, false],
+        ["userMetadata._bng_pppoe_session_id52", 16, false],
+        ["userMetadata._bng_ds_meter_result53", 32, false],
+        ["userMetadata._bng_s_tag54", 12, false],
+        ["userMetadata._bng_c_tag55", 12, false],
+        ["userMetadata._int_meta_source56", 1, false],
+        ["userMetadata._int_meta_transit57", 1, false],
+        ["userMetadata._int_meta_sink58", 1, false],
+        ["userMetadata._int_meta_switch_id59", 32, false],
+        ["userMetadata._int_meta_new_words60", 8, false],
+        ["userMetadata._int_meta_new_bytes61", 16, false],
+        ["userMetadata._int_meta_ig_tstamp62", 32, false],
+        ["userMetadata._int_meta_eg_tstamp63", 32, false],
+        ["userMetadata._port_type64", 2, false],
+        ["_padding_0", 4, false]
       ]
     },
     {
@@ -201,9 +214,31 @@
       ]
     },
     {
-      "name" : "tcp_t",
+      "name" : "gtpu_options_t",
       "id" : 11,
       "fields" : [
+        ["seq_num", 16, false],
+        ["n_pdu_num", 8, false],
+        ["next_ext", 8, false]
+      ]
+    },
+    {
+      "name" : "gtpu_ext_psc_t",
+      "id" : 12,
+      "fields" : [
+        ["len", 8, false],
+        ["type", 4, false],
+        ["spare0", 4, false],
+        ["ppp", 1, false],
+        ["rqi", 1, false],
+        ["qfi", 6, false],
+        ["next_ext", 8, false]
+      ]
+    },
+    {
+      "name" : "tcp_t",
+      "id" : 13,
+      "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
         ["seq_no", 32, false],
@@ -219,7 +254,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 12,
+      "id" : 14,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -231,7 +266,7 @@
     },
     {
       "name" : "ipv6_t",
-      "id" : 13,
+      "id" : 15,
       "fields" : [
         ["version", 4, false],
         ["traffic_class", 8, false],
@@ -245,7 +280,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 14,
+      "id" : 16,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -253,7 +288,7 @@
     },
     {
       "name" : "report_fixed_header_t",
-      "id" : 15,
+      "id" : 17,
       "fields" : [
         ["ver", 4, false],
         ["nproto", 4, false],
@@ -268,7 +303,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 16,
+      "id" : 18,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -278,7 +313,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 17,
+      "id" : 19,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -297,14 +332,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 18,
+      "id" : 20,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 19,
+      "id" : 21,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -312,14 +347,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 20,
+      "id" : 22,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 21,
+      "id" : 23,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -327,21 +362,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 22,
+      "id" : 24,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 23,
+      "id" : 25,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 24,
+      "id" : 26,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -349,14 +384,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 25,
+      "id" : 27,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "int_data_t",
-      "id" : 26,
+      "id" : 28,
       "fields" : [
         ["data", "*"]
       ],
@@ -364,7 +399,7 @@
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 27,
+      "id" : 29,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -466,204 +501,232 @@
       "pi_omit" : true
     },
     {
-      "name" : "gtpu",
+      "name" : "outer_gtpu_options",
       "id" : 13,
+      "header_type" : "gtpu_options_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "outer_gtpu_ext_psc",
+      "id" : 14,
+      "header_type" : "gtpu_ext_psc_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "gtpu",
+      "id" : 15,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "inner_ipv4",
-      "id" : 14,
-      "header_type" : "ipv4_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_udp",
-      "id" : 15,
-      "header_type" : "udp_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "inner_tcp",
+      "name" : "gtpu_options",
       "id" : 16,
-      "header_type" : "tcp_t",
+      "header_type" : "gtpu_options_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "inner_icmp",
+      "name" : "gtpu_ext_psc",
       "id" : 17,
-      "header_type" : "icmp_t",
+      "header_type" : "gtpu_ext_psc_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "ipv4",
+      "name" : "inner_ipv4",
       "id" : 18,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "ipv6",
+      "name" : "inner_udp",
       "id" : 19,
-      "header_type" : "ipv6_t",
+      "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "tcp",
+      "name" : "inner_tcp",
       "id" : 20,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "udp",
+      "name" : "inner_icmp",
       "id" : 21,
+      "header_type" : "icmp_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "ipv4",
+      "id" : 22,
+      "header_type" : "ipv4_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "ipv6",
+      "id" : 23,
+      "header_type" : "ipv6_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "tcp",
+      "id" : 24,
+      "header_type" : "tcp_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "udp",
+      "id" : 25,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 22,
+      "id" : 26,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 23,
+      "id" : 27,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 24,
+      "id" : 28,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ethernet",
-      "id" : 25,
+      "id" : 29,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_eth_type",
-      "id" : 26,
+      "id" : 30,
       "header_type" : "eth_type_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ipv4",
-      "id" : 27,
+      "id" : 31,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_udp",
-      "id" : 28,
+      "id" : 32,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_fixed_header",
-      "id" : 29,
+      "id" : 33,
       "header_type" : "report_fixed_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_shim",
-      "id" : 30,
+      "id" : 34,
       "header_type" : "intl4_shim_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_header",
-      "id" : 31,
+      "id" : 35,
       "header_type" : "int_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_switch_id",
-      "id" : 32,
+      "id" : 36,
       "header_type" : "int_switch_id_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_port_ids",
-      "id" : 33,
+      "id" : 37,
       "header_type" : "int_port_ids_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_hop_latency",
-      "id" : 34,
+      "id" : 38,
       "header_type" : "int_hop_latency_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_occupancy",
-      "id" : 35,
+      "id" : 39,
       "header_type" : "int_q_occupancy_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_ingress_tstamp",
-      "id" : 36,
+      "id" : 40,
       "header_type" : "int_ingress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tstamp",
-      "id" : 37,
+      "id" : 41,
       "header_type" : "int_egress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_congestion",
-      "id" : 38,
+      "id" : 42,
       "header_type" : "int_q_congestion_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tx_util",
-      "id" : 39,
+      "id" : 43,
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_data",
-      "id" : 40,
+      "id" : 44,
       "header_type" : "int_data_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_tail",
-      "id" : 41,
+      "id" : 45,
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
@@ -679,7 +742,7 @@
       "name" : "fl",
       "source_info" : {
         "filename" : "include/control/acl.p4",
-        "line" : 52,
+        "line" : 45,
         "column" : 40,
         "source_fragment" : "{standard_metadata.ingress_port}"
       },
@@ -1044,7 +1107,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._vlan_id1"]
+                  "value" : ["scalars", "userMetadata._vlan_id9"]
                 },
                 {
                   "type" : "hexstr",
@@ -1117,7 +1180,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._bng_s_tag40"]
+                  "value" : ["scalars", "userMetadata._bng_s_tag54"]
                 },
                 {
                   "type" : "field",
@@ -1178,7 +1241,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._bng_c_tag41"]
+                  "value" : ["scalars", "userMetadata._bng_c_tag55"]
                 },
                 {
                   "type" : "field",
@@ -1321,7 +1384,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._mpls_label8"]
+                  "value" : ["scalars", "userMetadata._mpls_label16"]
                 },
                 {
                   "type" : "field",
@@ -1334,7 +1397,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._mpls_ttl9"]
+                  "value" : ["scalars", "userMetadata._mpls_ttl17"]
                 },
                 {
                   "type" : "field",
@@ -1401,7 +1464,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._ip_proto16"]
+                  "value" : ["scalars", "userMetadata._ip_proto24"]
                 },
                 {
                   "type" : "field",
@@ -1414,7 +1477,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type8"]
                 },
                 {
                   "type" : "hexstr",
@@ -1427,7 +1490,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
+                  "value" : ["scalars", "userMetadata._ipv4_src_addr27"]
                 },
                 {
                   "type" : "field",
@@ -1440,7 +1503,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
+                  "value" : ["scalars", "userMetadata._ipv4_dst_addr28"]
                 },
                 {
                   "type" : "field",
@@ -1513,7 +1576,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._ip_proto16"]
+                  "value" : ["scalars", "userMetadata._ip_proto24"]
                 },
                 {
                   "type" : "field",
@@ -1526,7 +1589,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._ip_eth_type0"]
+                  "value" : ["scalars", "userMetadata._ip_eth_type8"]
                 },
                 {
                   "type" : "hexstr",
@@ -1586,7 +1649,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._l4_sport17"]
+                  "value" : ["scalars", "userMetadata._l4_sport25"]
                 },
                 {
                   "type" : "field",
@@ -1599,7 +1662,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._l4_dport18"]
+                  "value" : ["scalars", "userMetadata._l4_dport26"]
                 },
                 {
                   "type" : "field",
@@ -1636,7 +1699,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._l4_sport17"]
+                  "value" : ["scalars", "userMetadata._l4_sport25"]
                 },
                 {
                   "type" : "field",
@@ -1649,7 +1712,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._l4_dport18"]
+                  "value" : ["scalars", "userMetadata._l4_dport26"]
                 },
                 {
                   "type" : "field",
@@ -2237,8 +2300,142 @@
                 }
               ],
               "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x000000",
+              "mask" : null,
+              "next_state" : "parse_inner_ipv4"
             },
             {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : "parse_gtpu_options"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu", "ex_flag"]
+            },
+            {
+              "type" : "field",
+              "value" : ["gtpu", "seq_flag"]
+            },
+            {
+              "type" : "field",
+              "value" : ["gtpu", "npdu_flag"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_gtpu_options",
+          "id" : 16,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "gtpu_options"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "gtpu_ext_len_0"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 8]
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x8501",
+              "mask" : null,
+              "next_state" : "parse_gtpu_ext_psc"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_options", "next_ext"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "gtpu_ext_len_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_gtpu_ext_psc",
+          "id" : 17,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "gtpu_ext_psc"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "userMetadata._spgw_qfi43"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["gtpu_ext_psc", "qfi"]
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00",
+              "mask" : null,
+              "next_state" : "parse_inner_ipv4"
+            },
+            {
+              "type" : "default",
+              "value" : null,
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ext_psc", "next_ext"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_ipv4",
+          "id" : 18,
+          "parser_ops" : [
+            {
               "parameters" : [
                 {
                   "type" : "regular",
@@ -2296,7 +2493,7 @@
         },
         {
           "name" : "parse_inner_udp",
-          "id" : 16,
+          "id" : 19,
           "parser_ops" : [
             {
               "parameters" : [
@@ -2311,7 +2508,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._inner_l4_sport21"]
+                  "value" : ["scalars", "userMetadata._inner_l4_sport33"]
                 },
                 {
                   "type" : "field",
@@ -2324,7 +2521,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._inner_l4_dport22"]
+                  "value" : ["scalars", "userMetadata._inner_l4_dport34"]
                 },
                 {
                   "type" : "field",
@@ -2346,7 +2543,7 @@
         },
         {
           "name" : "parse_inner_tcp",
-          "id" : 17,
+          "id" : 20,
           "parser_ops" : [
             {
               "parameters" : [
@@ -2361,7 +2558,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._inner_l4_sport21"]
+                  "value" : ["scalars", "userMetadata._inner_l4_sport33"]
                 },
                 {
                   "type" : "field",
@@ -2374,7 +2571,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "userMetadata._inner_l4_dport22"]
+                  "value" : ["scalars", "userMetadata._inner_l4_dport34"]
                 },
                 {
                   "type" : "field",
@@ -2396,7 +2593,7 @@
         },
         {
           "name" : "parse_inner_icmp",
-          "id" : 18,
+          "id" : 21,
           "parser_ops" : [
             {
               "parameters" : [
@@ -2420,7 +2617,7 @@
         },
         {
           "name" : "parse_int",
-          "id" : 19,
+          "id" : 22,
           "parser_ops" : [],
           "transitions" : [
             {
@@ -2445,7 +2642,7 @@
         },
         {
           "name" : "parse_intl4_shim",
-          "id" : 20,
+          "id" : 23,
           "parser_ops" : [
             {
               "parameters" : [
@@ -2489,7 +2686,7 @@
         },
         {
           "name" : "parse_int_data",
-          "id" : 21,
+          "id" : 24,
           "parser_ops" : [
             {
               "parameters" : [
@@ -2586,7 +2783,7 @@
         },
         {
           "name" : "parse_intl4_tail",
-          "id" : 22,
+          "id" : 25,
           "parser_ops" : [
             {
               "parameters" : [
@@ -2618,11 +2815,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 285,
+        "line" : 308,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "report_ethernet", "report_eth_type", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "gtpu", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"],
+      "order" : ["packet_in", "report_ethernet", "report_eth_type", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "outer_gtpu", "outer_gtpu_options", "outer_gtpu_ext_psc", "ipv4", "ipv6", "tcp", "udp", "icmp", "gtpu", "gtpu_options", "gtpu_ext_psc", "inner_ipv4", "inner_tcp", "inner_udp", "inner_icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"],
       "primitives" : []
     }
   ],
@@ -2654,6 +2851,20 @@
       "size" : 8192,
       "rate_count" : 2,
       "type" : "bytes"
+    },
+    {
+      "name" : "FabricIngress.qos.slice_tc_meter",
+      "id" : 2,
+      "source_info" : {
+        "filename" : "include/control/slicing.p4",
+        "line" : 78,
+        "column" : 41,
+        "source_fragment" : "slice_tc_meter"
+      },
+      "is_direct" : false,
+      "size" : 64,
+      "rate_count" : 2,
+      "type" : "bytes"
     }
   ],
   "counter_arrays" : [
@@ -2820,7 +3031,7 @@
       "binding" : "FabricIngress.acl.acl",
       "source_info" : {
         "filename" : "include/control/acl.p4",
-        "line" : 36,
+        "line" : 29,
         "column" : 50,
         "source_fragment" : "acl_counter"
       }
@@ -2874,8 +3085,32 @@
       }
     },
     {
-      "name" : "FabricIngress.port_counters_control.egress_port_counter",
+      "name" : "FabricIngress.slice_tc_classifier.classifier_stats",
       "id" : 18,
+      "is_direct" : true,
+      "binding" : "FabricIngress.slice_tc_classifier.classifier",
+      "source_info" : {
+        "filename" : "include/control/slicing.p4",
+        "line" : 32,
+        "column" : 40,
+        "source_fragment" : "classifier_stats"
+      }
+    },
+    {
+      "name" : "FabricIngress.qos.queues_stats",
+      "id" : 19,
+      "is_direct" : true,
+      "binding" : "FabricIngress.qos.queues",
+      "source_info" : {
+        "filename" : "include/control/slicing.p4",
+        "line" : 80,
+        "column" : 40,
+        "source_fragment" : "queues_stats"
+      }
+    },
+    {
+      "name" : "FabricIngress.port_counters_control.egress_port_counter",
+      "id" : 20,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 26,
@@ -2887,7 +3122,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 19,
+      "id" : 21,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 27,
@@ -2899,10 +3134,10 @@
     },
     {
       "name" : "FabricIngress.spgw.pdr_counter",
-      "id" : 20,
+      "id" : 22,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 108,
+        "line" : 110,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -2911,7 +3146,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.c_line_tx",
-      "id" : 21,
+      "id" : 23,
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 267,
@@ -2923,7 +3158,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 22,
+      "id" : 24,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -2935,7 +3170,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 23,
+      "id" : 25,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
@@ -2947,10 +3182,10 @@
     },
     {
       "name" : "FabricEgress.spgw.pdr_counter",
-      "id" : 24,
+      "id" : 26,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 295,
+        "line" : 307,
         "column" : 53,
         "source_fragment" : "pdr_counter"
       },
@@ -3026,7 +3261,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 358,
+        "line" : 393,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -3252,7 +3487,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_source42"]
+              "value" : ["scalars", "userMetadata._int_meta_source56"]
             },
             {
               "type" : "expression",
@@ -3288,7 +3523,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_sink44"]
+              "value" : ["scalars", "userMetadata._int_meta_sink58"]
             },
             {
               "type" : "expression",
@@ -3366,7 +3601,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -3388,7 +3623,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type50"]
             },
             {
               "type" : "hexstr",
@@ -3397,7 +3632,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 184,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -3429,7 +3664,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type50"]
             },
             {
               "type" : "hexstr",
@@ -3438,7 +3673,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 163,
+            "line" : 184,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -3479,7 +3714,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 149,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3508,7 +3743,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -3539,7 +3774,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 133,
+            "line" : 150,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -3568,7 +3803,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -3595,7 +3830,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type50"]
             },
             {
               "type" : "hexstr",
@@ -3604,7 +3839,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 186,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -3614,7 +3849,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_pppoe_session_id38"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id52"]
             },
             {
               "type" : "runtime_data",
@@ -3637,7 +3872,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -3659,7 +3894,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type50"]
             },
             {
               "type" : "hexstr",
@@ -3668,7 +3903,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 165,
+            "line" : 186,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -3682,7 +3917,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -3748,7 +3983,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             },
             {
               "type" : "runtime_data",
@@ -3774,7 +4009,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding18"]
             },
             {
               "type" : "expression",
@@ -3803,7 +4038,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next19"]
             },
             {
               "type" : "expression",
@@ -3832,7 +4067,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._port_type50"]
+              "value" : ["scalars", "userMetadata._port_type64"]
             },
             {
               "type" : "hexstr",
@@ -3841,7 +4076,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 136,
             "column" : 38,
             "source_fragment" : "0x0; ..."
           }
@@ -3863,7 +4098,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._port_type50"]
+              "value" : ["scalars", "userMetadata._port_type64"]
             },
             {
               "type" : "runtime_data",
@@ -3898,7 +4133,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id9"]
             },
             {
               "type" : "runtime_data",
@@ -3917,7 +4152,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._port_type50"]
+              "value" : ["scalars", "userMetadata._port_type64"]
             },
             {
               "type" : "runtime_data",
@@ -3948,7 +4183,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._fwd_type12"]
+              "value" : ["scalars", "userMetadata._fwd_type20"]
             },
             {
               "type" : "runtime_data",
@@ -3979,7 +4214,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id21"]
             },
             {
               "type" : "runtime_data",
@@ -4010,7 +4245,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label16"]
             },
             {
               "type" : "hexstr",
@@ -4029,7 +4264,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id21"]
             },
             {
               "type" : "runtime_data",
@@ -4060,7 +4295,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id21"]
             },
             {
               "type" : "runtime_data",
@@ -4097,7 +4332,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id21"]
             },
             {
               "type" : "runtime_data",
@@ -4128,7 +4363,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label16"]
             },
             {
               "type" : "runtime_data",
@@ -4159,7 +4394,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id9"]
             },
             {
               "type" : "runtime_data",
@@ -4194,7 +4429,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id9"]
             },
             {
               "type" : "runtime_data",
@@ -4213,7 +4448,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._push_double_vlan4"]
+              "value" : ["scalars", "userMetadata._push_double_vlan12"]
             },
             {
               "type" : "expression",
@@ -4242,7 +4477,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id13"]
             },
             {
               "type" : "runtime_data",
@@ -4261,7 +4496,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_s_tag40"]
+              "value" : ["scalars", "userMetadata._bng_s_tag54"]
             },
             {
               "type" : "runtime_data",
@@ -4280,7 +4515,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_c_tag41"]
+              "value" : ["scalars", "userMetadata._bng_c_tag55"]
             },
             {
               "type" : "runtime_data",
@@ -4311,7 +4546,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id21"]
             },
             {
               "type" : "runtime_data",
@@ -4320,8 +4555,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 39,
-            "column" : 32,
+            "line" : 32,
+            "column" : 26,
             "source_fragment" : "= next_id; ..."
           }
         }
@@ -4346,7 +4581,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 45,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
@@ -4356,7 +4591,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next19"]
             },
             {
               "type" : "expression",
@@ -4375,8 +4610,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 46,
-            "column" : 34,
+            "line" : 39,
+            "column" : 28,
             "source_fragment" : "= true; ..."
           }
         }
@@ -4406,7 +4641,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 52,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "clone3(CloneType.I2E, clone_id, {standard_metadata.ingress_port})"
           }
@@ -4428,7 +4663,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 57,
+            "line" : 50,
             "column" : 8,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -4438,7 +4673,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next19"]
             },
             {
               "type" : "expression",
@@ -4457,8 +4692,8 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 58,
-            "column" : 34,
+            "line" : 51,
+            "column" : 28,
             "source_fragment" : "= true; ..."
           }
         }
@@ -4516,7 +4751,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._next_id13"]
+              "value" : ["scalars", "userMetadata._next_id21"]
             },
             {
               "type" : "runtime_data",
@@ -4782,7 +5017,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._is_multicast14"]
+              "value" : ["scalars", "userMetadata._is_multicast22"]
             },
             {
               "type" : "expression",
@@ -4809,1666 +5044,16 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
+      "name" : "FabricIngress.slice_tc_classifier.set_slice_id_tc",
       "id" : 54,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._ip_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 132,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._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", "userMetadata._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", "userMetadata._l4_sport17"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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", "userMetadata._l4_dport18"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._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" : "slice_id",
+          "bitwidth" : 4
+        },
+        {
+          "name" : "tc",
+          "bitwidth" : 2
         }
       ],
       "primitives" : [
@@ -6477,7 +5062,2079 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_src_iface30"]
+              "value" : ["scalars", "userMetadata._slice_id29"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 35,
+            "column" : 27,
+            "source_fragment" : "= slice_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._tc31"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 36,
+            "column" : 21,
+            "source_fragment" : "= tc; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.slice_tc_classifier.trust_dscp",
+      "id" : 55,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._slice_id29"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : ">>",
+                          "left" : {
+                            "type" : "field",
+                            "value" : ["ipv4", "dscp"]
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0x2"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0x0f"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 44,
+            "column" : 27,
+            "source_fragment" : "= hdr.ipv4.dscp[4 +2 -1:2]; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._tc31"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["ipv4", "dscp"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0x03"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 45,
+            "column" : 21,
+            "source_fragment" : "= hdr.ipv4.dscp[2 -1:0]; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.qos.set_queue",
+      "id" : 56,
+      "runtime_data" : [
+        {
+          "name" : "qid",
+          "bitwidth" : 5
+        }
+      ],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.qos.meter_drop",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 89,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
+      "id" : 58,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "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" : 55,
+            "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" : 56,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp",
+      "id" : 59,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 61,
+            "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" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp",
+      "id" : 60,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "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" : 68,
+            "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" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown",
+      "id" : 61,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_tcp",
+      "id" : 62,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 54,
+            "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" : 55,
+            "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" : 56,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_tcp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_udp",
+      "id" : 63,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            },
+            {
+              "type" : "header",
+              "value" : "inner_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 61,
+            "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" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_icmp",
+      "id" : 64,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 67,
+            "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" : 68,
+            "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" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_icmp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_unknown",
+      "id" : 65,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 149,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._ip_proto24"]
+            },
+            {
+              "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", "userMetadata._ipv4_src_addr27"]
+            },
+            {
+              "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", "userMetadata._ipv4_dst_addr28"]
+            },
+            {
+              "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", "userMetadata._l4_sport25"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_sport33"]
+            }
+          ],
+          "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", "userMetadata._l4_dport26"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._inner_l4_dport34"]
+            }
+          ],
+          "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" : "gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_options.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ext_psc.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.udp.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_iface",
+      "id" : 66,
+      "runtime_data" : [
+        {
+          "name" : "src_iface",
+          "bitwidth" : 8
+        },
+        {
+          "name" : "slice_id",
+          "bitwidth" : 4
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_src_iface42"]
             },
             {
               "type" : "runtime_data",
@@ -6486,7 +7143,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 120,
+            "line" : 122,
             "column" : 33,
             "source_fragment" : "= src_iface; ..."
           }
@@ -6496,7 +7153,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_skip_spgw31"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw44"]
             },
             {
               "type" : "expression",
@@ -6515,16 +7172,35 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 121,
+            "line" : 123,
             "column" : 33,
             "source_fragment" : "= false; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._slice_id29"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 124,
+            "column" : 27,
+            "source_fragment" : "= slice_id; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.spgw.iface_miss",
-      "id" : 63,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6532,7 +7208,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_src_iface30"]
+              "value" : ["scalars", "userMetadata._spgw_src_iface42"]
             },
             {
               "type" : "hexstr",
@@ -6541,7 +7217,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 127,
             "column" : 44,
             "source_fragment" : "8w0; ..."
           }
@@ -6551,7 +7227,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_skip_spgw31"]
+              "value" : ["scalars", "userMetadata._spgw_skip_spgw44"]
             },
             {
               "type" : "expression",
@@ -6570,7 +7246,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 125,
+            "line" : 128,
             "column" : 33,
             "source_fragment" : "= true; ..."
           }
@@ -6579,7 +7255,7 @@
     },
     {
       "name" : "FabricIngress.spgw.load_pdr",
-      "id" : 64,
+      "id" : 68,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -6592,6 +7268,10 @@
         {
           "name" : "needs_gtpu_decap",
           "bitwidth" : 1
+        },
+        {
+          "name" : "tc",
+          "bitwidth" : 2
         }
       ],
       "primitives" : [
@@ -6600,7 +7280,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id40"]
             },
             {
               "type" : "runtime_data",
@@ -6609,7 +7289,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 150,
+            "line" : 153,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -6619,7 +7299,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id41"]
             },
             {
               "type" : "runtime_data",
@@ -6628,7 +7308,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 154,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -6638,7 +7318,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap47"]
             },
             {
               "type" : "expression",
@@ -6667,16 +7347,35 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 155,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._tc31"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 156,
+            "column" : 21,
+            "source_fragment" : "= tc; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.spgw.load_pdr",
-      "id" : 65,
+      "id" : 69,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -6689,6 +7388,10 @@
         {
           "name" : "needs_gtpu_decap",
           "bitwidth" : 1
+        },
+        {
+          "name" : "tc",
+          "bitwidth" : 2
         }
       ],
       "primitives" : [
@@ -6697,7 +7400,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id40"]
             },
             {
               "type" : "runtime_data",
@@ -6706,7 +7409,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 150,
+            "line" : 153,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -6716,7 +7419,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id41"]
             },
             {
               "type" : "runtime_data",
@@ -6725,7 +7428,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 154,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -6735,7 +7438,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap47"]
             },
             {
               "type" : "expression",
@@ -6764,16 +7467,35 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 155,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._tc31"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 156,
+            "column" : 21,
+            "source_fragment" : "= tc; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.spgw.load_pdr_qos",
-      "id" : 66,
+      "id" : 70,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -6788,8 +7510,16 @@
           "bitwidth" : 1
         },
         {
-          "name" : "qid",
-          "bitwidth" : 5
+          "name" : "needs_qfi_push",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "qfi",
+          "bitwidth" : 6
+        },
+        {
+          "name" : "tc",
+          "bitwidth" : 2
         }
       ],
       "primitives" : [
@@ -6798,7 +7528,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id40"]
             },
             {
               "type" : "runtime_data",
@@ -6807,7 +7537,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 150,
+            "line" : 153,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -6817,7 +7547,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id41"]
             },
             {
               "type" : "runtime_data",
@@ -6826,7 +7556,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 154,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -6836,7 +7566,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap47"]
             },
             {
               "type" : "expression",
@@ -6865,16 +7595,93 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 155,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._tc31"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 5
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 156,
+            "column" : 21,
+            "source_fragment" : "= tc; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_qfi43"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 167,
+            "column" : 27,
+            "source_fragment" : "= qfi; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_needs_qfi_push49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 3
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 168,
+            "column" : 38,
+            "source_fragment" : "= (bool)needs_qfi_push; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.spgw.load_pdr_qos",
-      "id" : 67,
+      "id" : 71,
       "runtime_data" : [
         {
           "name" : "ctr_id",
@@ -6889,8 +7696,16 @@
           "bitwidth" : 1
         },
         {
-          "name" : "qid",
-          "bitwidth" : 5
+          "name" : "needs_qfi_push",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "qfi",
+          "bitwidth" : 6
+        },
+        {
+          "name" : "tc",
+          "bitwidth" : 2
         }
       ],
       "primitives" : [
@@ -6899,7 +7714,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id40"]
             },
             {
               "type" : "runtime_data",
@@ -6908,7 +7723,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 150,
+            "line" : 153,
             "column" : 30,
             "source_fragment" : "= ctr_id; ..."
           }
@@ -6918,7 +7733,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_far_id29"]
+              "value" : ["scalars", "userMetadata._spgw_far_id41"]
             },
             {
               "type" : "runtime_data",
@@ -6927,7 +7742,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 151,
+            "line" : 154,
             "column" : 30,
             "source_fragment" : "= far_id; ..."
           }
@@ -6937,7 +7752,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap47"]
             },
             {
               "type" : "expression",
@@ -6966,16 +7781,93 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 152,
+            "line" : 155,
             "column" : 40,
             "source_fragment" : "= (bool)needs_gtpu_decap; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._tc31"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 5
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 156,
+            "column" : 21,
+            "source_fragment" : "= tc; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_qfi43"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 167,
+            "column" : 27,
+            "source_fragment" : "= qfi; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_needs_qfi_push49"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 3
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 168,
+            "column" : 38,
+            "source_fragment" : "= (bool)needs_qfi_push; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.spgw.load_normal_far",
-      "id" : 68,
+      "id" : 72,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -6992,7 +7884,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding18"]
             },
             {
               "type" : "expression",
@@ -7021,7 +7913,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 195,
+            "line" : 207,
             "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -7031,7 +7923,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next19"]
             },
             {
               "type" : "expression",
@@ -7060,7 +7952,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 196,
+            "line" : 208,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -7070,7 +7962,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_notify_spgwc32"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc45"]
             },
             {
               "type" : "expression",
@@ -7099,7 +7991,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 197,
+            "line" : 209,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -7108,7 +8000,7 @@
     },
     {
       "name" : "FabricIngress.spgw.load_tunnel_far",
-      "id" : 69,
+      "id" : 73,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -7141,7 +8033,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding18"]
             },
             {
               "type" : "expression",
@@ -7170,7 +8062,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 206,
+            "line" : 218,
             "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -7180,7 +8072,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next19"]
             },
             {
               "type" : "expression",
@@ -7209,7 +8101,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 207,
+            "line" : 219,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -7219,7 +8111,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_notify_spgwc32"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc45"]
             },
             {
               "type" : "expression",
@@ -7248,7 +8140,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 208,
+            "line" : 220,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -7258,7 +8150,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap33"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap46"]
             },
             {
               "type" : "expression",
@@ -7277,7 +8169,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 210,
+            "line" : 222,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -7287,7 +8179,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_teid24"]
+              "value" : ["scalars", "userMetadata._spgw_teid36"]
             },
             {
               "type" : "runtime_data",
@@ -7296,7 +8188,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 223,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -7306,7 +8198,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port25"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port37"]
             },
             {
               "type" : "runtime_data",
@@ -7315,7 +8207,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 224,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -7325,7 +8217,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr26"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr38"]
             },
             {
               "type" : "runtime_data",
@@ -7334,7 +8226,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 225,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -7344,7 +8236,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr27"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr39"]
             },
             {
               "type" : "runtime_data",
@@ -7353,7 +8245,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 214,
+            "line" : 226,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -7363,7 +8255,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr27"]
             },
             {
               "type" : "runtime_data",
@@ -7372,7 +8264,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 216,
+            "line" : 228,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -7382,7 +8274,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr28"]
             },
             {
               "type" : "runtime_data",
@@ -7391,7 +8283,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 229,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -7401,7 +8293,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport25"]
             },
             {
               "type" : "runtime_data",
@@ -7410,7 +8302,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 230,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -7420,7 +8312,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport26"]
             },
             {
               "type" : "hexstr",
@@ -7429,7 +8321,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 231,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -7438,7 +8330,7 @@
     },
     {
       "name" : "FabricIngress.spgw.load_dbuf_far",
-      "id" : 70,
+      "id" : 74,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -7471,7 +8363,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_forwarding10"]
+              "value" : ["scalars", "userMetadata._skip_forwarding18"]
             },
             {
               "type" : "expression",
@@ -7500,7 +8392,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 206,
+            "line" : 218,
             "column" : 34,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -7510,7 +8402,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._skip_next11"]
+              "value" : ["scalars", "userMetadata._skip_next19"]
             },
             {
               "type" : "expression",
@@ -7539,7 +8431,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 207,
+            "line" : 219,
             "column" : 28,
             "source_fragment" : "= (bool)drop; ..."
           }
@@ -7549,7 +8441,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_notify_spgwc32"]
+              "value" : ["scalars", "userMetadata._spgw_notify_spgwc45"]
             },
             {
               "type" : "expression",
@@ -7578,7 +8470,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 208,
+            "line" : 220,
             "column" : 36,
             "source_fragment" : "= (bool)notify_cp; ..."
           }
@@ -7588,7 +8480,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap33"]
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap46"]
             },
             {
               "type" : "expression",
@@ -7607,7 +8499,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 210,
+            "line" : 222,
             "column" : 40,
             "source_fragment" : "= true; ..."
           }
@@ -7617,7 +8509,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_teid24"]
+              "value" : ["scalars", "userMetadata._spgw_teid36"]
             },
             {
               "type" : "runtime_data",
@@ -7626,7 +8518,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 211,
+            "line" : 223,
             "column" : 28,
             "source_fragment" : "= teid; ..."
           }
@@ -7636,7 +8528,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port25"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port37"]
             },
             {
               "type" : "runtime_data",
@@ -7645,7 +8537,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 212,
+            "line" : 224,
             "column" : 39,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -7655,7 +8547,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr26"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr38"]
             },
             {
               "type" : "runtime_data",
@@ -7664,7 +8556,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 213,
+            "line" : 225,
             "column" : 39,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -7674,7 +8566,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr27"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr39"]
             },
             {
               "type" : "runtime_data",
@@ -7683,7 +8575,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 214,
+            "line" : 226,
             "column" : 39,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -7693,7 +8585,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
+              "value" : ["scalars", "userMetadata._ipv4_src_addr27"]
             },
             {
               "type" : "runtime_data",
@@ -7702,7 +8594,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 216,
+            "line" : 228,
             "column" : 32,
             "source_fragment" : "= tunnel_src_addr; ..."
           }
@@ -7712,7 +8604,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
+              "value" : ["scalars", "userMetadata._ipv4_dst_addr28"]
             },
             {
               "type" : "runtime_data",
@@ -7721,7 +8613,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 217,
+            "line" : 229,
             "column" : 32,
             "source_fragment" : "= tunnel_dst_addr; ..."
           }
@@ -7731,7 +8623,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._l4_sport17"]
+              "value" : ["scalars", "userMetadata._l4_sport25"]
             },
             {
               "type" : "runtime_data",
@@ -7740,7 +8632,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 218,
+            "line" : 230,
             "column" : 27,
             "source_fragment" : "= tunnel_src_port; ..."
           }
@@ -7750,7 +8642,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport26"]
             },
             {
               "type" : "hexstr",
@@ -7759,7 +8651,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 219,
+            "line" : 231,
             "column" : 27,
             "source_fragment" : "= 2152; ..."
           }
@@ -7769,7 +8661,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr35"]
+              "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr48"]
             },
             {
               "type" : "expression",
@@ -7788,7 +8680,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 230,
+            "line" : 242,
             "column" : 43,
             "source_fragment" : "= true; ..."
           }
@@ -7796,8 +8688,633 @@
       ]
     },
     {
+      "name" : "lookup_md_init37",
+      "id" : 75,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_sport4"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_tcp", "sport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 37,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_tcp.sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_dport5"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_tcp", "dport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 38,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_tcp.dport; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init40",
+      "id" : 76,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_sport4"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_udp", "sport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_udp.sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_dport5"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_udp", "dport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 41,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_udp.dport; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init43",
+      "id" : 77,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_icmp_type6"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_icmp", "icmp_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 43,
+            "column" : 33,
+            "source_fragment" : "= hdr.inner_icmp.icmp_type; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_icmp_code7"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_icmp", "icmp_code"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 44,
+            "column" : 33,
+            "source_fragment" : "= hdr.inner_icmp.icmp_code; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init32",
+      "id" : 78,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_is_ipv40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 32,
+            "column" : 27,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ipv4_src1"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 33,
+            "column" : 28,
+            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ipv4_dst2"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 34,
+            "column" : 28,
+            "source_fragment" : "= hdr.inner_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ip_proto3"]
+            },
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 35,
+            "column" : 28,
+            "source_fragment" : "= hdr.inner_ipv4.protocol; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init52",
+      "id" : 79,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_sport4"]
+            },
+            {
+              "type" : "field",
+              "value" : ["tcp", "sport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 52,
+            "column" : 32,
+            "source_fragment" : "= hdr.tcp.sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_dport5"]
+            },
+            {
+              "type" : "field",
+              "value" : ["tcp", "dport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 53,
+            "column" : 32,
+            "source_fragment" : "= hdr.tcp.dport; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init55",
+      "id" : 80,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_sport4"]
+            },
+            {
+              "type" : "field",
+              "value" : ["udp", "sport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 55,
+            "column" : 32,
+            "source_fragment" : "= hdr.udp.sport; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_dport5"]
+            },
+            {
+              "type" : "field",
+              "value" : ["udp", "dport"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 56,
+            "column" : 32,
+            "source_fragment" : "= hdr.udp.dport; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init58",
+      "id" : 81,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_icmp_type6"]
+            },
+            {
+              "type" : "field",
+              "value" : ["icmp", "icmp_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 58,
+            "column" : 33,
+            "source_fragment" : "= hdr.icmp.icmp_type; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_icmp_code7"]
+            },
+            {
+              "type" : "field",
+              "value" : ["icmp", "icmp_code"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 59,
+            "column" : 33,
+            "source_fragment" : "= hdr.icmp.icmp_code; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init47",
+      "id" : 82,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_is_ipv40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 47,
+            "column" : 27,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ipv4_src1"]
+            },
+            {
+              "type" : "field",
+              "value" : ["ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 48,
+            "column" : 28,
+            "source_fragment" : "= hdr.ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ipv4_dst2"]
+            },
+            {
+              "type" : "field",
+              "value" : ["ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 49,
+            "column" : 28,
+            "source_fragment" : "= hdr.ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ip_proto3"]
+            },
+            {
+              "type" : "field",
+              "value" : ["ipv4", "protocol"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 50,
+            "column" : 28,
+            "source_fragment" : "= hdr.ipv4.protocol; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "lookup_md_init23",
+      "id" : 83,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_is_ipv40"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 23,
+            "column" : 23,
+            "source_fragment" : "= false; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ipv4_src1"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 24,
+            "column" : 24,
+            "source_fragment" : "= 0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ipv4_dst2"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 25,
+            "column" : 24,
+            "source_fragment" : "= 0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_ip_proto3"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 26,
+            "column" : 24,
+            "source_fragment" : "= 0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_sport4"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 27,
+            "column" : 24,
+            "source_fragment" : "= 0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_l4_dport5"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 28,
+            "column" : 24,
+            "source_fragment" : "= 0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_icmp_type6"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 29,
+            "column" : 25,
+            "source_fragment" : "= 0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._lkp_icmp_code7"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 30,
+            "column" : 25,
+            "source_fragment" : "= 0; ..."
+          }
+        }
+      ]
+    },
+    {
       "name" : "packetio25",
-      "id" : 71,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7839,7 +9356,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._is_controller_packet_out15"]
+              "value" : ["scalars", "userMetadata._is_controller_packet_out23"]
             },
             {
               "type" : "expression",
@@ -7876,60 +9393,8 @@
       ]
     },
     {
-      "name" : "spgw265",
-      "id" : 72,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "count",
-          "parameters" : [
-            {
-              "type" : "counter_array",
-              "value" : "FabricIngress.spgw.pdr_counter"
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 265,
-            "column" : 16,
-            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "spgw282",
-      "id" : 73,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ipv4_len23"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ipv4", "total_len"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 282,
-            "column" : 36,
-            "source_fragment" : "= hdr.ipv4.total_len; ..."
-          }
-        }
-      ]
-    },
-    {
       "name" : "filtering113",
-      "id" : 74,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7937,7 +9402,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id9"]
             },
             {
               "type" : "field",
@@ -7956,7 +9421,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri10"]
             },
             {
               "type" : "field",
@@ -7975,7 +9440,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi11"]
             },
             {
               "type" : "field",
@@ -7993,7 +9458,7 @@
     },
     {
       "name" : "filtering119",
-      "id" : 75,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8001,7 +9466,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id13"]
             },
             {
               "type" : "field",
@@ -8020,7 +9485,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._inner_vlan_pri6"]
+              "value" : ["scalars", "userMetadata._inner_vlan_pri14"]
             },
             {
               "type" : "field",
@@ -8039,7 +9504,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._inner_vlan_cfi7"]
+              "value" : ["scalars", "userMetadata._inner_vlan_cfi15"]
             },
             {
               "type" : "field",
@@ -8057,7 +9522,7 @@
     },
     {
       "name" : "filtering129",
-      "id" : 76,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8065,7 +9530,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._mpls_ttl9"]
+              "value" : ["scalars", "userMetadata._mpls_ttl17"]
             },
             {
               "type" : "hexstr",
@@ -8082,53 +9547,34 @@
       ]
     },
     {
-      "name" : "acl102",
-      "id" : 77,
+      "name" : "spgw277",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
+          "op" : "count",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_sport"]
+              "type" : "counter_array",
+              "value" : "FabricIngress.spgw.pdr_counter"
             },
             {
               "type" : "field",
-              "value" : ["inner_tcp", "sport"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id40"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 102,
+            "filename" : "include/control/spgw.p4",
+            "line" : 277,
             "column" : 16,
-            "source_fragment" : "l4_sport = hdr.inner_tcp.sport"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_dport"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_tcp", "dport"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 103,
-            "column" : 16,
-            "source_fragment" : "l4_dport = hdr.inner_tcp.dport"
+            "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
         }
       ]
     },
     {
-      "name" : "acl105",
-      "id" : 78,
+      "name" : "spgw294",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8136,364 +9582,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "acl_l4_sport"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len35"]
             },
             {
               "type" : "field",
-              "value" : ["inner_udp", "sport"]
+              "value" : ["ipv4", "total_len"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 105,
-            "column" : 16,
-            "source_fragment" : "l4_sport = hdr.inner_udp.sport"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_dport"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_udp", "dport"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 106,
-            "column" : 16,
-            "source_fragment" : "l4_dport = hdr.inner_udp.dport"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "acl98",
-      "id" : 79,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ipv4_src"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 98,
-            "column" : 12,
-            "source_fragment" : "ipv4_src = hdr.inner_ipv4.src_addr"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ipv4_dst"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 99,
-            "column" : 12,
-            "source_fragment" : "ipv4_dst = hdr.inner_ipv4.dst_addr"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ip_proto"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 100,
-            "column" : 12,
-            "source_fragment" : "ip_proto = hdr.inner_ipv4.protocol"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "acl113",
-      "id" : 80,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_sport"]
-            },
-            {
-              "type" : "field",
-              "value" : ["tcp", "sport"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 113,
-            "column" : 16,
-            "source_fragment" : "l4_sport = hdr.tcp.sport"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_dport"]
-            },
-            {
-              "type" : "field",
-              "value" : ["tcp", "dport"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 114,
-            "column" : 16,
-            "source_fragment" : "l4_dport = hdr.tcp.dport"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "acl116",
-      "id" : 81,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_sport"]
-            },
-            {
-              "type" : "field",
-              "value" : ["udp", "sport"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 116,
-            "column" : 16,
-            "source_fragment" : "l4_sport = hdr.udp.sport"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_dport"]
-            },
-            {
-              "type" : "field",
-              "value" : ["udp", "dport"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 117,
-            "column" : 16,
-            "source_fragment" : "l4_dport = hdr.udp.dport"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "acl109",
-      "id" : 82,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ipv4_src"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ipv4", "src_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 109,
-            "column" : 12,
-            "source_fragment" : "ipv4_src = hdr.ipv4.src_addr"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ipv4_dst"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ipv4", "dst_addr"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 110,
-            "column" : 12,
-            "source_fragment" : "ipv4_dst = hdr.ipv4.dst_addr"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ip_proto"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ipv4", "protocol"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 111,
-            "column" : 12,
-            "source_fragment" : "ip_proto = hdr.ipv4.protocol"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "acl27",
-      "id" : 83,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ipv4_src"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 27,
-            "column" : 4,
-            "source_fragment" : "ipv4_addr_t ipv4_src = 0;"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ipv4_dst"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 28,
-            "column" : 4,
-            "source_fragment" : "ipv4_addr_t ipv4_dst = 0;"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_ip_proto"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 29,
-            "column" : 4,
-            "source_fragment" : "bit<8> ip_proto = 0;"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_sport"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 30,
-            "column" : 4,
-            "source_fragment" : "l4_port_t l4_sport = 0;"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "acl_l4_dport"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 31,
-            "column" : 4,
-            "source_fragment" : "l4_port_t l4_dport = 0;"
+            "filename" : "include/control/spgw.p4",
+            "line" : 294,
+            "column" : 36,
+            "source_fragment" : "= hdr.ipv4.total_len; ..."
           }
         }
       ]
     },
     {
       "name" : "port_counter31",
-      "id" : 84,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8551,7 +9658,7 @@
     },
     {
       "name" : "port_counter34",
-      "id" : 85,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8609,7 +9716,7 @@
     },
     {
       "name" : "int_main89",
-      "id" : 86,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8635,7 +9742,7 @@
     },
     {
       "name" : "bng126",
-      "id" : 87,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8671,7 +9778,7 @@
     },
     {
       "name" : "bng342",
-      "id" : 88,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8679,7 +9786,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_type36"]
+              "value" : ["scalars", "userMetadata._bng_type50"]
             },
             {
               "type" : "hexstr",
@@ -8688,7 +9795,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 164,
+            "line" : 185,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -8720,7 +9827,7 @@
     },
     {
       "name" : "bng131",
-      "id" : 89,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8732,7 +9839,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -8746,7 +9853,7 @@
     },
     {
       "name" : "bng139",
-      "id" : 90,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8758,7 +9865,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -8772,7 +9879,7 @@
     },
     {
       "name" : "bng112",
-      "id" : 91,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8831,7 +9938,7 @@
     },
     {
       "name" : "bng238",
-      "id" : 92,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8843,11 +9950,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result53"]
             }
           ],
           "source_info" : {
@@ -8861,7 +9968,7 @@
     },
     {
       "name" : "bng241",
-      "id" : 93,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8873,11 +9980,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result53"]
             }
           ],
           "source_info" : {
@@ -8891,7 +9998,7 @@
     },
     {
       "name" : "bng250",
-      "id" : 94,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8903,11 +10010,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result53"]
             }
           ],
           "source_info" : {
@@ -8921,7 +10028,7 @@
     },
     {
       "name" : "bng253",
-      "id" : 95,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8933,11 +10040,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_ds_meter_result39"]
+              "value" : ["scalars", "userMetadata._bng_ds_meter_result53"]
             }
           ],
           "source_info" : {
@@ -8950,38 +10057,248 @@
       ]
     },
     {
+      "name" : "slicing114",
+      "id" : 102,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_11"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "|",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : "<<",
+                              "left" : {
+                                "type" : "expression",
+                                "value" : {
+                                  "op" : "&",
+                                  "left" : {
+                                    "type" : "field",
+                                    "value" : ["scalars", "userMetadata._slice_id29"]
+                                  },
+                                  "right" : {
+                                    "type" : "hexstr",
+                                    "value" : "0x3f"
+                                  }
+                                }
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x2"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0x3f"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : "&",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "userMetadata._tc31"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x3f"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0x07"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 114,
+            "column" : 37,
+            "source_fragment" : "(bit<32>) slice_tc"
+          }
+        },
+        {
+          "op" : "execute_meter",
+          "parameters" : [
+            {
+              "type" : "meter_array",
+              "value" : "FabricIngress.qos.slice_tc_meter"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_11"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._packet_color30"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 114,
+            "column" : 8,
+            "source_fragment" : "slice_tc_meter.execute_meter((bit<32>) slice_tc, fabric_md.packet_color)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._dscp32"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "|",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "<<",
+                          "left" : {
+                            "type" : "expression",
+                            "value" : {
+                              "op" : "&",
+                              "left" : {
+                                "type" : "field",
+                                "value" : ["scalars", "userMetadata._slice_id29"]
+                              },
+                              "right" : {
+                                "type" : "hexstr",
+                                "value" : "0x3f"
+                              }
+                            }
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0x2"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x3f"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : "&",
+                          "left" : {
+                            "type" : "field",
+                            "value" : ["scalars", "userMetadata._tc31"]
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0x3f"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x07"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 110,
+            "column" : 26,
+            "source_fragment" : "fabric_md.slice_id++fabric_md.tc; ..."
+          }
+        }
+      ]
+    },
+    {
       "name" : "nop",
-      "id" : 96,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 97,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 98,
+      "id" : 105,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 99,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 100,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v4",
-      "id" : 101,
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8998,7 +10315,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 136,
+            "line" : 153,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -9084,7 +10401,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_pppoe_session_id38"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id52"]
             }
           ],
           "source_info" : {
@@ -9103,7 +10420,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -9169,7 +10486,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 138,
+            "line" : 155,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -9178,7 +10495,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v6",
-      "id" : 102,
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9195,7 +10512,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 136,
+            "line" : 153,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -9281,7 +10598,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_pppoe_session_id38"]
+              "value" : ["scalars", "userMetadata._bng_pppoe_session_id52"]
             }
           ],
           "source_info" : {
@@ -9300,7 +10617,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._bng_line_id37"]
+              "value" : ["scalars", "userMetadata._bng_line_id51"]
             }
           ],
           "source_info" : {
@@ -9366,7 +10683,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 139,
+            "line" : 156,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -9375,7 +10692,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 103,
+      "id" : 111,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -9443,7 +10760,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 169,
+            "line" : 186,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -9734,7 +11051,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._l4_dport18"]
+              "value" : ["scalars", "userMetadata._l4_dport26"]
             }
           ],
           "source_info" : {
@@ -9861,7 +11178,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 165,
+            "line" : 182,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -9870,7 +11187,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 104,
+      "id" : 112,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -9883,7 +11200,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_transit43"]
+              "value" : ["scalars", "userMetadata._int_meta_transit57"]
             },
             {
               "type" : "expression",
@@ -9912,7 +11229,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
             },
             {
               "type" : "runtime_data",
@@ -9930,1490 +11247,12 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 105,
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 106,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 107,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 108,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 109,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 110,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 111,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 112,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_occupancy"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 62,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_occupancy", "q_occupancy"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "deq_qdepth"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 63,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_hop_latency"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_hop_latency", "hop_latency"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "deq_timedelta"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_port_ids"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 47,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "ingress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_port_ids", "egress_port_id"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x03"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 109,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x000c"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 110,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 113,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
       "id" : 114,
       "runtime_data" : [],
       "primitives" : [
@@ -11484,45 +11323,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -11536,11 +11341,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -11554,9 +11359,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -11564,7 +11369,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -11578,11 +11383,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -11596,15 +11401,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
       "id" : 115,
       "runtime_data" : [],
       "primitives" : [
@@ -11643,45 +11448,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -11695,11 +11466,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -11713,9 +11484,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -11723,7 +11494,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -11737,11 +11508,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -11755,15 +11526,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
       "id" : 116,
       "runtime_data" : [],
       "primitives" : [
@@ -11868,45 +11639,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -11920,11 +11657,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -11938,9 +11675,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -11948,7 +11685,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -11962,11 +11699,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -11980,15 +11717,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
       "id" : 117,
       "runtime_data" : [],
       "primitives" : [
@@ -12072,45 +11809,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -12124,11 +11827,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -12142,9 +11845,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -12152,7 +11855,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -12166,11 +11869,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -12184,15 +11887,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
       "id" : 118,
       "runtime_data" : [],
       "primitives" : [
@@ -12342,45 +12045,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -12394,11 +12063,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -12412,9 +12081,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -12422,7 +12091,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -12436,11 +12105,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -12454,15 +12123,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
       "id" : 119,
       "runtime_data" : [],
       "primitives" : [
@@ -12580,45 +12249,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -12632,11 +12267,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -12650,9 +12285,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -12660,7 +12295,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -12674,11 +12309,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -12692,15 +12327,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
       "id" : 120,
       "runtime_data" : [],
       "primitives" : [
@@ -12884,45 +12519,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_switch_id"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_switch_id", "switch_id"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_switch_id45"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -12936,1226 +12537,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x04"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 115,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0010"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 116,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 121,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 122,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 123,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 124,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 125,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x01"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 97,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0004"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 98,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 126,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 127,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x02"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 103,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x0008"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 104,
-            "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 128,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tx_util"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 88,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_q_congestion"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 80,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_id"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 82,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_q_congestion", "q_congestion"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x000000"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 83,
-            "column" : 8,
-            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_egress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["int_egress_tstamp", "egress_tstamp"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "enq_timestamp"]
-                      },
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["standard_metadata", "deq_timedelta"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -14183,7 +12565,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -14197,7 +12579,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -14223,8 +12605,8 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 129,
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
+      "id" : 121,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14232,14 +12614,14 @@
           "parameters" : [
             {
               "type" : "header",
-              "value" : "int_ingress_tstamp"
+              "value" : "int_switch_id"
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 41,
             "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+            "source_fragment" : "hdr.int_switch_id.setValid()"
           }
         },
         {
@@ -14247,18 +12629,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+              "value" : ["int_switch_id", "switch_id"]
             },
             {
               "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -14266,7 +12648,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -14280,7 +12662,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -14308,7 +12690,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -14322,7 +12704,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -14348,7 +12730,1604 @@
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
+      "id" : 122,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
+      "id" : 123,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
+      "id" : 124,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
+      "id" : 125,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
+      "id" : 126,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
+      "id" : 127,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
+      "id" : 128,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_occupancy"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_occupancy", "q_occupancy"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "deq_qdepth"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 63,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_hop_latency"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_hop_latency", "hop_latency"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "deq_timedelta"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 55,
+            "column" : 8,
+            "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_port_ids"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "ingress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_port_ids", "egress_port_id"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_switch_id"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_switch_id", "switch_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_switch_id59"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 42,
+            "column" : 8,
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x04"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 115,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0010"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 116,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
+      "id" : 129,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
       "id" : 130,
       "runtime_data" : [],
       "primitives" : [
@@ -14387,45 +14366,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -14439,11 +14384,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -14457,9 +14402,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -14467,7 +14412,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -14481,11 +14426,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -14499,15 +14444,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
       "id" : 131,
       "runtime_data" : [],
       "primitives" : [
@@ -14565,45 +14510,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -14617,11 +14528,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -14635,9 +14546,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -14645,7 +14556,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -14659,11 +14570,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -14677,15 +14588,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
       "id" : 132,
       "runtime_data" : [],
       "primitives" : [
@@ -14777,45 +14688,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -14829,11 +14706,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -14847,9 +14724,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -14857,7 +14734,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -14871,11 +14748,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -14889,15 +14766,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
       "id" : 133,
       "runtime_data" : [],
       "primitives" : [
@@ -14959,45 +14836,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -15011,11 +14854,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x02"
+                        "value" : "0x01"
                       }
                     }
                   },
@@ -15029,9 +14872,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 97,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -15039,7 +14882,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -15053,11 +14896,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x0008"
+                        "value" : "0x0004"
                       }
                     }
                   },
@@ -15071,15 +14914,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 98,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
       "id" : 134,
       "runtime_data" : [],
       "primitives" : [
@@ -15175,45 +15018,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -15227,11 +15036,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -15245,9 +15054,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -15255,7 +15064,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -15269,11 +15078,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -15287,15 +15096,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
       "id" : 135,
       "runtime_data" : [],
       "primitives" : [
@@ -15410,45 +15219,11 @@
           }
         },
         {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "int_ingress_tstamp"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 68,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
-          }
-        },
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "enq_timestamp"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 69,
-            "column" : 8,
-            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -15462,11 +15237,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x03"
+                        "value" : "0x02"
                       }
                     }
                   },
@@ -15480,9 +15255,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 109,
+            "line" : 103,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -15490,7 +15265,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -15504,11 +15279,11 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
-                        "value" : "0x000c"
+                        "value" : "0x0008"
                       }
                     }
                   },
@@ -15522,15 +15297,15 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 110,
+            "line" : 104,
             "column" : 33,
-            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
       "id" : 136,
       "runtime_data" : [],
       "primitives" : [
@@ -15679,6 +15454,97 @@
           }
         },
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
+      "id" : 137,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -15717,7 +15583,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
             },
             {
               "type" : "expression",
@@ -15731,7 +15597,1458 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x01"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0004"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 98,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
+      "id" : 138,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
+      "id" : 139,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
+      "id" : 140,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
+      "id" : 141,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x02"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 103,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 104,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
+      "id" : 142,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
+      "id" : 143,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x03"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 109,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x000c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 110,
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
+      "id" : 144,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tx_util"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 88,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tx_util", "egress_port_tx_util"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 90,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_q_congestion"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 80,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 82,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_q_congestion", "q_congestion"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 83,
+            "column" : 8,
+            "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_egress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_egress_tstamp", "egress_tstamp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "enq_timestamp"]
+                      },
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["standard_metadata", "deq_timedelta"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "int_ingress_tstamp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 68,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["int_ingress_tstamp", "ingress_tstamp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "enq_timestamp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 69,
+            "column" : 8,
+            "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._int_meta_new_words60"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -15759,7 +17076,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+              "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
             },
             {
               "type" : "expression",
@@ -15773,7 +17090,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -15800,7 +17117,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 137,
+      "id" : 145,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -15906,7 +17223,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 149,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -16134,7 +17451,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 144,
+            "line" : 161,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -16320,7 +17637,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 175,
+            "line" : 192,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -16415,7 +17732,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 179,
+            "line" : 196,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -16462,7 +17779,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 138,
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16507,7 +17824,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 139,
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16838,7 +18155,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 140,
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16865,7 +18182,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._ip_eth_type0"]
+              "value" : ["scalars", "userMetadata._ip_eth_type8"]
             }
           ],
           "source_info" : {
@@ -16879,7 +18196,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 141,
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -16906,7 +18223,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._mpls_label8"]
+              "value" : ["scalars", "userMetadata._mpls_label16"]
             }
           ],
           "source_info" : {
@@ -16963,7 +18280,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._mpls_ttl9"]
+              "value" : ["scalars", "userMetadata._mpls_ttl17"]
             }
           ],
           "source_info" : {
@@ -16987,7 +18304,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 130,
+            "line" : 147,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -16996,7 +18313,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_outer_vlan",
-      "id" : 142,
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17023,7 +18340,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi11"]
             }
           ],
           "source_info" : {
@@ -17042,7 +18359,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri10"]
             }
           ],
           "source_info" : {
@@ -17066,7 +18383,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 146,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -17080,7 +18397,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id9"]
             }
           ],
           "source_info" : {
@@ -17094,7 +18411,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_inner_vlan",
-      "id" : 143,
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17121,7 +18438,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._inner_vlan_cfi7"]
+              "value" : ["scalars", "userMetadata._inner_vlan_cfi15"]
             }
           ],
           "source_info" : {
@@ -17140,7 +18457,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._inner_vlan_pri6"]
+              "value" : ["scalars", "userMetadata._inner_vlan_pri14"]
             }
           ],
           "source_info" : {
@@ -17159,7 +18476,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._inner_vlan_id5"]
+              "value" : ["scalars", "userMetadata._inner_vlan_id13"]
             }
           ],
           "source_info" : {
@@ -17183,7 +18500,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 146,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -17202,7 +18519,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 146,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -17211,7 +18528,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 144,
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17238,7 +18555,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_cfi3"]
+              "value" : ["scalars", "userMetadata._vlan_cfi11"]
             }
           ],
           "source_info" : {
@@ -17257,7 +18574,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_pri2"]
+              "value" : ["scalars", "userMetadata._vlan_pri10"]
             }
           ],
           "source_info" : {
@@ -17281,7 +18598,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 146,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -17295,7 +18612,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_id1"]
+              "value" : ["scalars", "userMetadata._vlan_id9"]
             }
           ],
           "source_info" : {
@@ -17309,7 +18626,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 145,
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17331,7 +18648,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.drop",
-      "id" : 146,
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17352,8 +18669,40 @@
       ]
     },
     {
+      "name" : "FabricEgress.dscp_rewriter.rewrite",
+      "id" : 155,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.dscp_rewriter.clear",
+      "id" : 156,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "dscp_rewriter_tmp_dscp"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 135,
+            "column" : 8,
+            "source_fragment" : "tmp_dscp = 0"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricEgress.spgw.gtpu_encap",
-      "id" : 147,
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17366,7 +18715,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 300,
+            "line" : 311,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.setValid()"
           }
@@ -17385,7 +18734,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 301,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.version = 4"
           }
@@ -17404,7 +18753,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 164,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -17423,7 +18772,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 303,
+            "line" : 314,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
           }
@@ -17442,7 +18791,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 304,
+            "line" : 315,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
           }
@@ -17484,7 +18833,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 305,
+            "line" : 316,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
           }
@@ -17503,7 +18852,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 307,
+            "line" : 318,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
           }
@@ -17522,7 +18871,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 308,
+            "line" : 319,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
           }
@@ -17541,7 +18890,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 309,
+            "line" : 320,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
           }
@@ -17560,7 +18909,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 160,
+            "line" : 177,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -17579,7 +18928,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 144,
+            "line" : 161,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -17593,12 +18942,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr26"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr38"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 312,
+            "line" : 323,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
           }
@@ -17612,12 +18961,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr27"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr39"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 313,
+            "line" : 324,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
           }
@@ -17636,7 +18985,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 314,
+            "line" : 325,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
           }
@@ -17651,7 +19000,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 316,
+            "line" : 327,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.setValid()"
           }
@@ -17665,12 +19014,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port25"]
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port37"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 317,
+            "line" : 328,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
           }
@@ -17689,7 +19038,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 318,
+            "line" : 329,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.dport = 2152"
           }
@@ -17713,7 +19062,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._spgw_ipv4_len23"]
+                        "value" : ["scalars", "userMetadata._spgw_ipv4_len35"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -17731,7 +19080,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 319,
+            "line" : 330,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
           }
@@ -17750,7 +19099,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 321,
+            "line" : 332,
             "column" : 8,
             "source_fragment" : "hdr.gtpu_udp.checksum = 0"
           }
@@ -17765,7 +19114,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 324,
+            "line" : 334,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.setValid()"
           }
@@ -17784,7 +19133,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 325,
+            "line" : 335,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.version = 0x01"
           }
@@ -17803,7 +19152,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 326,
+            "line" : 336,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
           }
@@ -17822,7 +19171,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 327,
+            "line" : 337,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.spare = 0"
           }
@@ -17841,7 +19190,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 328,
+            "line" : 338,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
           }
@@ -17860,7 +19209,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 329,
+            "line" : 339,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
           }
@@ -17879,7 +19228,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 330,
+            "line" : 340,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
           }
@@ -17898,7 +19247,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 331,
+            "line" : 341,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
           }
@@ -17912,12 +19261,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ipv4_len23"]
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len35"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 332,
+            "line" : 342,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
           }
@@ -17931,12 +19280,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_teid24"]
+              "value" : ["scalars", "userMetadata._spgw_teid36"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 333,
+            "line" : 343,
             "column" : 8,
             "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
           }
@@ -17944,8 +19293,870 @@
       ]
     },
     {
+      "name" : "FabricEgress.spgw.gtpu_encap_qfi",
+      "id" : 158,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_ipv4"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 311,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "version"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x04"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 312,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.version = 4"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "ihl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x05"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 164,
+            "column" : 28,
+            "source_fragment" : "5; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "dscp"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 314,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.dscp = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "ecn"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 315,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.ecn = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "total_len"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "total_len"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0024"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 316,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "identification"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x1513"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 318,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.identification = 0x1513"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "flags"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 319,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.flags = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "frag_offset"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 320,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.frag_offset = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x40"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 177,
+            "column" : 32,
+            "source_fragment" : "64; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "protocol"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x11"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 161,
+            "column" : 25,
+            "source_fragment" : "17; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "src_addr"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_addr38"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 323,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.src_addr = fabric_md.spgw.tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "dst_addr"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_dst_addr39"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 324,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.dst_addr = fabric_md.spgw.tunnel_dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "hdr_checksum"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 325,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.hdr_checksum = 0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "gtpu_udp"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 327,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "sport"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_tunnel_src_port37"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 328,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.sport = fabric_md.spgw.tunnel_src_port; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "dport"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0868"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 329,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.dport = 2152"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "len"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._spgw_ipv4_len35"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0010"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 330,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "checksum"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 332,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.checksum = 0"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "outer_gtpu"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 334,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "version"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 335,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.version = 0x01"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "pt"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 336,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.pt = 0x01"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "spare"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 337,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.spare = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "ex_flag"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 338,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.ex_flag = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "seq_flag"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 339,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.seq_flag = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "npdu_flag"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 340,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.npdu_flag = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "msgtype"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0xff"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 341,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.msgtype = 0xff"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "msglen"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_ipv4_len35"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 342,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "teid"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_teid36"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 343,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.teid = fabric_md.spgw.teid; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "total_len"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "total_len"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x002c"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 349,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_ipv4.total_len = hdr.ipv4.total_len ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_udp", "len"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._spgw_ipv4_len35"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0018"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 352,
+            "column" : 8,
+            "source_fragment" : "hdr.gtpu_udp.len = fabric_md.spgw.ipv4_len ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "msglen"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["scalars", "userMetadata._spgw_ipv4_len35"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0008"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 355,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.msglen = fabric_md.spgw.ipv4_len ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu", "ex_flag"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 357,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu.ex_flag = 1"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "outer_gtpu_options"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 358,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu_options.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu_options", "next_ext"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x85"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 359,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu_options.next_ext = 0x85"
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "outer_gtpu_ext_psc"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 360,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu_ext_psc.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu_ext_psc", "type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 88,
+            "column" : 36,
+            "source_fragment" : "4w0; // Downlink ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu_ext_psc", "len"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 362,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu_ext_psc.len = 8w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu_ext_psc", "qfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_qfi43"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 363,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu_ext_psc.qfi = fabric_md.spgw.qfi; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["outer_gtpu_ext_psc", "next_ext"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 364,
+            "column" : 8,
+            "source_fragment" : "hdr.outer_gtpu_ext_psc.next_ext = 0x0"
+          }
+        }
+      ]
+    },
+    {
       "name" : "packetio41",
-      "id" : 148,
+      "id" : 159,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -17962,7 +20173,7 @@
     },
     {
       "name" : "packetio44",
-      "id" : 149,
+      "id" : 160,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18013,7 +20224,7 @@
     },
     {
       "name" : "next283",
-      "id" : 150,
+      "id" : 161,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18035,7 +20246,7 @@
     },
     {
       "name" : "next299",
-      "id" : 151,
+      "id" : 162,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18057,7 +20268,7 @@
     },
     {
       "name" : "next310",
-      "id" : 152,
+      "id" : 163,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18079,7 +20290,7 @@
     },
     {
       "name" : "next309",
-      "id" : 153,
+      "id" : 164,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18128,7 +20339,7 @@
     },
     {
       "name" : "next314",
-      "id" : 154,
+      "id" : 165,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18150,7 +20361,7 @@
     },
     {
       "name" : "next313",
-      "id" : 155,
+      "id" : 166,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18199,7 +20410,7 @@
     },
     {
       "name" : "next319",
-      "id" : 156,
+      "id" : 167,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18221,7 +20432,7 @@
     },
     {
       "name" : "next318",
-      "id" : 157,
+      "id" : 168,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18269,8 +20480,8 @@
       ]
     },
     {
-      "name" : "spgw342",
-      "id" : 158,
+      "name" : "spgw377",
+      "id" : 169,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18282,12 +20493,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ctr_id28"]
+              "value" : ["scalars", "userMetadata._spgw_ctr_id40"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 342,
+            "line" : 377,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           }
@@ -18296,7 +20507,7 @@
     },
     {
       "name" : "act",
-      "id" : 159,
+      "id" : 170,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18326,7 +20537,7 @@
     },
     {
       "name" : "int_transit420",
-      "id" : 160,
+      "id" : 171,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18362,7 +20573,7 @@
     },
     {
       "name" : "int_transit428",
-      "id" : 161,
+      "id" : 172,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18388,7 +20599,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       }
                     }
                   },
@@ -18411,7 +20622,7 @@
     },
     {
       "name" : "int_transit425",
-      "id" : 162,
+      "id" : 173,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18460,7 +20671,7 @@
     },
     {
       "name" : "int_transit431",
-      "id" : 163,
+      "id" : 174,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18486,7 +20697,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_bytes47"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_bytes61"]
                       }
                     }
                   },
@@ -18509,7 +20720,7 @@
     },
     {
       "name" : "int_transit434",
-      "id" : 164,
+      "id" : 175,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -18535,7 +20746,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "userMetadata._int_meta_new_words46"]
+                        "value" : ["scalars", "userMetadata._int_meta_new_words60"]
                       }
                     }
                   },
@@ -18555,6 +20766,84 @@
           }
         }
       ]
+    },
+    {
+      "name" : "slicing155",
+      "id" : 176,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "dscp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "dscp_rewriter_tmp_dscp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 155,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.dscp = tmp_dscp"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "slicing159",
+      "id" : 177,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["inner_ipv4", "dscp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "dscp_rewriter_tmp_dscp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 159,
+            "column" : 16,
+            "source_fragment" : "hdr.inner_ipv4.dscp = tmp_dscp"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "slicing126",
+      "id" : 178,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "dscp_rewriter_tmp_dscp"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._dscp32"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 126,
+            "column" : 4,
+            "source_fragment" : "bit<6> tmp_dscp = fabric_md.dscp; ..."
+          }
+        }
+      ]
     }
   ],
   "pipelines" : [
@@ -18563,16 +20852,277 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 47,
+        "line" : 49,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
-      "init_table" : "node_2",
+      "init_table" : "tbl_lookup_md_init23",
       "tables" : [
         {
-          "name" : "tbl_packetio25",
+          "name" : "tbl_lookup_md_init23",
           "id" : 0,
           "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 23,
+            "column" : 23,
+            "source_fragment" : "= false; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [83],
+          "actions" : ["lookup_md_init23"],
+          "base_default_next" : "node_3",
+          "next_tables" : {
+            "lookup_md_init23" : "node_3"
+          },
+          "default_entry" : {
+            "action_id" : 83,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init32",
+          "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 32,
+            "column" : 27,
+            "source_fragment" : "= true; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [78],
+          "actions" : ["lookup_md_init32"],
+          "base_default_next" : "node_5",
+          "next_tables" : {
+            "lookup_md_init32" : "node_5"
+          },
+          "default_entry" : {
+            "action_id" : 78,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init37",
+          "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 37,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_tcp.sport; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [75],
+          "actions" : ["lookup_md_init37"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "lookup_md_init37" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 75,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init40",
+          "id" : 3,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 40,
+            "column" : 32,
+            "source_fragment" : "= hdr.inner_udp.sport; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [76],
+          "actions" : ["lookup_md_init40"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "lookup_md_init40" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 76,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init43",
+          "id" : 4,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 43,
+            "column" : 33,
+            "source_fragment" : "= hdr.inner_icmp.icmp_type; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [77],
+          "actions" : ["lookup_md_init43"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "lookup_md_init43" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 77,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init47",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 47,
+            "column" : 27,
+            "source_fragment" : "= true; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [82],
+          "actions" : ["lookup_md_init47"],
+          "base_default_next" : "node_13",
+          "next_tables" : {
+            "lookup_md_init47" : "node_13"
+          },
+          "default_entry" : {
+            "action_id" : 82,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init52",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 52,
+            "column" : 32,
+            "source_fragment" : "= hdr.tcp.sport; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [79],
+          "actions" : ["lookup_md_init52"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "lookup_md_init52" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 79,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init55",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 55,
+            "column" : 32,
+            "source_fragment" : "= hdr.udp.sport; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [80],
+          "actions" : ["lookup_md_init55"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "lookup_md_init55" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 80,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_lookup_md_init58",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 58,
+            "column" : 33,
+            "source_fragment" : "= hdr.icmp.icmp_type; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [81],
+          "actions" : ["lookup_md_init58"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "lookup_md_init58" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 81,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_packetio25",
+          "id" : 9,
+          "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 25,
             "column" : 42,
@@ -18585,511 +21135,89 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71],
+          "action_ids" : [84],
           "actions" : ["packetio25"],
-          "base_default_next" : "FabricIngress.spgw.interfaces",
+          "base_default_next" : "FabricIngress.slice_tc_classifier.classifier",
           "next_tables" : {
-            "packetio25" : "FabricIngress.spgw.interfaces"
+            "packetio25" : "FabricIngress.slice_tc_classifier.classifier"
           },
           "default_entry" : {
-            "action_id" : 71,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw.interfaces",
-          "id" : 1,
+          "name" : "FabricIngress.slice_tc_classifier.classifier",
+          "id" : 10,
           "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 129,
+            "filename" : "include/control/slicing.p4",
+            "line" : 49,
             "column" : 10,
-            "source_fragment" : "interfaces"
+            "source_fragment" : "classifier"
           },
           "key" : [
             {
-              "match_type" : "lpm",
-              "name" : "ipv4_dst_addr",
-              "target" : ["ipv4", "dst_addr"],
+              "match_type" : "ternary",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
-              "match_type" : "exact",
-              "name" : "gtpu_is_valid",
-              "target" : ["gtpu", "$valid$"],
+              "match_type" : "ternary",
+              "name" : "ipv4_src",
+              "target" : ["scalars", "userMetadata._lkp_ipv4_src1"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv4_dst",
+              "target" : ["scalars", "userMetadata._lkp_ipv4_dst2"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ip_proto",
+              "target" : ["scalars", "userMetadata._lkp_ip_proto3"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "l4_sport",
+              "target" : ["scalars", "userMetadata._lkp_l4_sport4"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "l4_dport",
+              "target" : ["scalars", "userMetadata._lkp_l4_dport5"],
               "mask" : null
             }
           ],
-          "match_type" : "lpm",
+          "match_type" : "ternary",
           "type" : "simple",
-          "max_size" : 128,
-          "with_counters" : false,
+          "max_size" : 512,
+          "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62, 63],
-          "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
-          "base_default_next" : null,
+          "action_ids" : [54, 55],
+          "actions" : ["FabricIngress.slice_tc_classifier.set_slice_id_tc", "FabricIngress.slice_tc_classifier.trust_dscp"],
+          "base_default_next" : "node_22",
           "next_tables" : {
-            "__HIT__" : "node_5",
-            "__MISS__" : "node_16"
+            "FabricIngress.slice_tc_classifier.set_slice_id_tc" : "node_22",
+            "FabricIngress.slice_tc_classifier.trust_dscp" : "node_22"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 54,
             "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "id" : 2,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 10,
-            "source_fragment" : "decap_gtpu"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "hdr.inner_tcp.$valid$",
-              "target" : ["inner_tcp", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.inner_udp.$valid$",
-              "target" : ["inner_udp", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.inner_icmp.$valid$",
-              "target" : ["inner_icmp", "$valid$"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [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_7",
-          "next_tables" : {
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_7",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_7",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_7",
-            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 57,
-            "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" : 54,
-                "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" : 55,
-                "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" : 56,
-                "action_data" : []
-              },
-              "priority" : 3
-            }
-          ]
-        },
-        {
-          "name" : "FabricIngress.spgw.uplink_pdrs",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 176,
-            "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, 67, 15],
-          "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_10",
-          "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_10",
-            "FabricIngress.spgw.load_pdr_qos" : "node_10",
-            "NoAction" : "node_10"
-          },
-          "default_entry" : {
-            "action_id" : 15,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw.downlink_pdrs",
-          "id" : 4,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 164,
-            "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, 66, 14],
-          "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
-          "base_default_next" : "node_10",
-          "next_tables" : {
-            "FabricIngress.spgw.load_pdr" : "node_10",
-            "FabricIngress.spgw.load_pdr_qos" : "node_10",
-            "NoAction" : "node_10"
-          },
-          "default_entry" : {
-            "action_id" : 14,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_spgw265",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 265,
-            "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" : ["spgw265"],
-          "base_default_next" : "node_12",
-          "next_tables" : {
-            "spgw265" : "node_12"
-          },
-          "default_entry" : {
-            "action_id" : 72,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 75,
-            "column" : 10,
-            "source_fragment" : "decap_gtpu"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "hdr.inner_tcp.$valid$",
-              "target" : ["inner_tcp", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.inner_udp.$valid$",
-              "target" : ["inner_udp", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.inner_icmp.$valid$",
-              "target" : ["inner_icmp", "$valid$"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [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" : 7,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 233,
-            "column" : 10,
-            "source_fragment" : "fars"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "far_id",
-              "target" : ["scalars", "userMetadata._spgw_far_id29"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 2048,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [68, 69, 70],
-          "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
-          "base_default_next" : "tbl_spgw282",
-          "next_tables" : {
-            "FabricIngress.spgw.load_normal_far" : "tbl_spgw282",
-            "FabricIngress.spgw.load_tunnel_far" : "tbl_spgw282",
-            "FabricIngress.spgw.load_dbuf_far" : "tbl_spgw282"
-          },
-          "default_entry" : {
-            "action_id" : 68,
-            "action_const" : true,
-            "action_data" : ["0x1", "0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw282",
-          "id" : 8,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 282,
-            "column" : 36,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["spgw282"],
-          "base_default_next" : "node_16",
-          "next_tables" : {
-            "spgw282" : "node_16"
-          },
-          "default_entry" : {
-            "action_id" : 73,
-            "action_const" : true,
-            "action_data" : [],
+            "action_data" : ["0x0", "0x0"],
             "action_entry_const" : true
           }
         },
         {
           "name" : "tbl_filtering113",
-          "id" : 9,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 113,
@@ -19103,14 +21231,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
+          "action_ids" : [85],
           "actions" : ["filtering113"],
-          "base_default_next" : "node_18",
+          "base_default_next" : "node_24",
           "next_tables" : {
-            "filtering113" : "node_18"
+            "filtering113" : "node_24"
           },
           "default_entry" : {
-            "action_id" : 74,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19118,7 +21246,7 @@
         },
         {
           "name" : "tbl_filtering119",
-          "id" : 10,
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 119,
@@ -19132,14 +21260,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
+          "action_ids" : [86],
           "actions" : ["filtering119"],
-          "base_default_next" : "node_20",
+          "base_default_next" : "node_26",
           "next_tables" : {
-            "filtering119" : "node_20"
+            "filtering119" : "node_26"
           },
           "default_entry" : {
-            "action_id" : 75,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19147,7 +21275,7 @@
         },
         {
           "name" : "tbl_filtering129",
-          "id" : 11,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 129,
@@ -19161,14 +21289,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
+          "action_ids" : [87],
           "actions" : ["filtering129"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
             "filtering129" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19176,7 +21304,7 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 12,
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 55,
@@ -19232,7 +21360,7 @@
         },
         {
           "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 13,
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 94,
@@ -19261,7 +21389,7 @@
             {
               "match_type" : "exact",
               "name" : "ip_eth_type",
-              "target" : ["scalars", "userMetadata._ip_eth_type0"],
+              "target" : ["scalars", "userMetadata._ip_eth_type8"],
               "mask" : null
             }
           ],
@@ -19273,9 +21401,9 @@
           "direct_meters" : null,
           "action_ids" : [33],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_24",
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_24"
+            "FabricIngress.filtering.set_forwarding_type" : "node_30"
           },
           "default_entry" : {
             "action_id" : 33,
@@ -19285,8 +21413,509 @@
           }
         },
         {
+          "name" : "FabricIngress.spgw.interfaces",
+          "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 132,
+            "column" : 10,
+            "source_fragment" : "interfaces"
+          },
+          "key" : [
+            {
+              "match_type" : "lpm",
+              "name" : "ipv4_dst_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "gtpu_is_valid",
+              "target" : ["gtpu", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "lpm",
+          "type" : "simple",
+          "max_size" : 128,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [66, 67],
+          "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__HIT__" : "node_32",
+            "__MISS__" : "node_43"
+          },
+          "default_entry" : {
+            "action_id" : 67,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 77,
+            "column" : 10,
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [58, 59, 60, 61],
+          "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_34",
+          "next_tables" : {
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp" : "node_34",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp" : "node_34",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp" : "node_34",
+            "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_34"
+          },
+          "default_entry" : {
+            "action_id" : 61,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "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" : 92,
+                "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" : 93,
+                "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.uplink_pdrs",
+          "id" : 18,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 184,
+            "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",
+              "name" : "has_qfi",
+              "target" : ["gtpu_ext_psc", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "qfi",
+              "target" : ["scalars", "userMetadata._spgw_qfi43"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [69, 71, 15],
+          "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
+          "base_default_next" : "node_37",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_37",
+            "FabricIngress.spgw.load_pdr_qos" : "node_37",
+            "NoAction" : "node_37"
+          },
+          "default_entry" : {
+            "action_id" : 15,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.downlink_pdrs",
+          "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 172,
+            "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" : [68, 70, 14],
+          "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
+          "base_default_next" : "node_37",
+          "next_tables" : {
+            "FabricIngress.spgw.load_pdr" : "node_37",
+            "FabricIngress.spgw.load_pdr_qos" : "node_37",
+            "NoAction" : "node_37"
+          },
+          "default_entry" : {
+            "action_id" : 14,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "tbl_spgw277",
+          "id" : 20,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 277,
+            "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" : [88],
+          "actions" : ["spgw277"],
+          "base_default_next" : "node_39",
+          "next_tables" : {
+            "spgw277" : "node_39"
+          },
+          "default_entry" : {
+            "action_id" : 88,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 77,
+            "column" : 10,
+            "source_fragment" : "decap_gtpu"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_tcp.$valid$",
+              "target" : ["inner_tcp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_udp.$valid$",
+              "target" : ["inner_udp", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "hdr.inner_icmp.$valid$",
+              "target" : ["inner_icmp", "$valid$"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [62, 63, 64, 65],
+          "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" : 65,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          },
+          "entries" : [
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 91,
+                "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" : 62,
+                "action_data" : []
+              },
+              "priority" : 1
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 92,
+                "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" : 63,
+                "action_data" : []
+              },
+              "priority" : 2
+            },
+            {
+              "source_info" : {
+                "filename" : "include/control/spgw.p4",
+                "line" : 93,
+                "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" : 64,
+                "action_data" : []
+              },
+              "priority" : 3
+            }
+          ]
+        },
+        {
+          "name" : "FabricIngress.spgw.fars",
+          "id" : 22,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 245,
+            "column" : 10,
+            "source_fragment" : "fars"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "far_id",
+              "target" : ["scalars", "userMetadata._spgw_far_id41"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 2048,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [72, 73, 74],
+          "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
+          "base_default_next" : "tbl_spgw294",
+          "next_tables" : {
+            "FabricIngress.spgw.load_normal_far" : "tbl_spgw294",
+            "FabricIngress.spgw.load_tunnel_far" : "tbl_spgw294",
+            "FabricIngress.spgw.load_dbuf_far" : "tbl_spgw294"
+          },
+          "default_entry" : {
+            "action_id" : 72,
+            "action_const" : true,
+            "action_data" : ["0x1", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw294",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 294,
+            "column" : 36,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [89],
+          "actions" : ["spgw294"],
+          "base_default_next" : "node_43",
+          "next_tables" : {
+            "spgw294" : "node_43"
+          },
+          "default_entry" : {
+            "action_id" : 89,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 14,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -19297,7 +21926,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "userMetadata._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id9"],
               "mask" : null
             },
             {
@@ -19315,10 +21944,10 @@
           "direct_meters" : null,
           "action_ids" : [34, 4],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
-          "base_default_next" : "node_33",
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "node_33",
-            "nop" : "node_33"
+            "FabricIngress.forwarding.set_next_id_bridging" : "node_52",
+            "nop" : "node_52"
           },
           "default_entry" : {
             "action_id" : 4,
@@ -19329,7 +21958,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 15,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -19340,7 +21969,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "userMetadata._mpls_label8"],
+              "target" : ["scalars", "userMetadata._mpls_label16"],
               "mask" : null
             }
           ],
@@ -19352,10 +21981,10 @@
           "direct_meters" : null,
           "action_ids" : [35, 5],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
-          "base_default_next" : "node_33",
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "node_33",
-            "nop" : "node_33"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "node_52",
+            "nop" : "node_52"
           },
           "default_entry" : {
             "action_id" : 5,
@@ -19366,7 +21995,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 16,
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 108,
@@ -19377,7 +22006,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "userMetadata._ipv4_dst_addr20"],
+              "target" : ["scalars", "userMetadata._ipv4_dst_addr28"],
               "mask" : null
             }
           ],
@@ -19389,11 +22018,11 @@
           "direct_meters" : null,
           "action_ids" : [36, 37, 6],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
-          "base_default_next" : "node_33",
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "node_33",
-            "FabricIngress.forwarding.nop_routing_v4" : "node_33",
-            "nop" : "node_33"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "node_52",
+            "FabricIngress.forwarding.nop_routing_v4" : "node_52",
+            "nop" : "node_52"
           },
           "default_entry" : {
             "action_id" : 6,
@@ -19404,7 +22033,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v6",
-          "id" : 17,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 135,
@@ -19427,10 +22056,10 @@
           "direct_meters" : null,
           "action_ids" : [38, 7],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
-          "base_default_next" : "node_33",
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v6" : "node_33",
-            "nop" : "node_33"
+            "FabricIngress.forwarding.set_next_id_routing_v6" : "node_52",
+            "nop" : "node_52"
           },
           "default_entry" : {
             "action_id" : 7,
@@ -19441,7 +22070,7 @@
         },
         {
           "name" : "FabricIngress.pre_next.next_mpls",
-          "id" : 18,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/pre_next.p4",
             "line" : 36,
@@ -19452,7 +22081,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "userMetadata._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id21"],
               "mask" : null
             }
           ],
@@ -19478,7 +22107,7 @@
         },
         {
           "name" : "FabricIngress.pre_next.next_vlan",
-          "id" : 19,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/pre_next.p4",
             "line" : 73,
@@ -19489,7 +22118,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "userMetadata._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id21"],
               "mask" : null
             }
           ],
@@ -19501,11 +22130,11 @@
           "direct_meters" : null,
           "action_ids" : [40, 41, 9],
           "actions" : ["FabricIngress.pre_next.set_vlan", "FabricIngress.pre_next.set_double_vlan", "nop"],
-          "base_default_next" : "tbl_acl27",
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.pre_next.set_vlan" : "tbl_acl27",
-            "FabricIngress.pre_next.set_double_vlan" : "tbl_acl27",
-            "nop" : "tbl_acl27"
+            "FabricIngress.pre_next.set_vlan" : "FabricIngress.acl.acl",
+            "FabricIngress.pre_next.set_double_vlan" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 9,
@@ -19515,214 +22144,11 @@
           }
         },
         {
-          "name" : "tbl_acl27",
-          "id" : 20,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 27,
-            "column" : 4,
-            "source_fragment" : "ipv4_addr_t ipv4_src = 0; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["acl27"],
-          "base_default_next" : "node_37",
-          "next_tables" : {
-            "acl27" : "node_37"
-          },
-          "default_entry" : {
-            "action_id" : 83,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_acl98",
-          "id" : 21,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 98,
-            "column" : 21,
-            "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [79],
-          "actions" : ["acl98"],
-          "base_default_next" : "node_39",
-          "next_tables" : {
-            "acl98" : "node_39"
-          },
-          "default_entry" : {
-            "action_id" : 79,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_acl102",
-          "id" : 22,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 102,
-            "column" : 25,
-            "source_fragment" : "= hdr.inner_tcp.sport; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [77],
-          "actions" : ["acl102"],
-          "base_default_next" : "FabricIngress.acl.acl",
-          "next_tables" : {
-            "acl102" : "FabricIngress.acl.acl"
-          },
-          "default_entry" : {
-            "action_id" : 77,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_acl105",
-          "id" : 23,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 105,
-            "column" : 25,
-            "source_fragment" : "= hdr.inner_udp.sport; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [78],
-          "actions" : ["acl105"],
-          "base_default_next" : "FabricIngress.acl.acl",
-          "next_tables" : {
-            "acl105" : "FabricIngress.acl.acl"
-          },
-          "default_entry" : {
-            "action_id" : 78,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_acl109",
-          "id" : 24,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 109,
-            "column" : 21,
-            "source_fragment" : "= hdr.ipv4.src_addr; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["acl109"],
-          "base_default_next" : "node_45",
-          "next_tables" : {
-            "acl109" : "node_45"
-          },
-          "default_entry" : {
-            "action_id" : 82,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_acl113",
-          "id" : 25,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 113,
-            "column" : 25,
-            "source_fragment" : "= hdr.tcp.sport; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [80],
-          "actions" : ["acl113"],
-          "base_default_next" : "FabricIngress.acl.acl",
-          "next_tables" : {
-            "acl113" : "FabricIngress.acl.acl"
-          },
-          "default_entry" : {
-            "action_id" : 80,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_acl116",
-          "id" : 26,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 116,
-            "column" : 25,
-            "source_fragment" : "= hdr.udp.sport; ..."
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["acl116"],
-          "base_default_next" : "FabricIngress.acl.acl",
-          "next_tables" : {
-            "acl116" : "FabricIngress.acl.acl"
-          },
-          "default_entry" : {
-            "action_id" : 81,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.acl.acl",
-          "id" : 27,
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 66,
+            "line" : 59,
             "column" : 10,
             "source_fragment" : "acl"
           },
@@ -19760,19 +22186,19 @@
             {
               "match_type" : "ternary",
               "name" : "ipv4_src",
-              "target" : ["scalars", "acl_ipv4_src"],
+              "target" : ["scalars", "userMetadata._lkp_ipv4_src1"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "ipv4_dst",
-              "target" : ["scalars", "acl_ipv4_dst"],
+              "target" : ["scalars", "userMetadata._lkp_ipv4_dst2"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "acl_ip_proto"],
+              "target" : ["scalars", "userMetadata._lkp_ip_proto3"],
               "mask" : null
             },
             {
@@ -19790,19 +22216,19 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "acl_l4_sport"],
+              "target" : ["scalars", "userMetadata._lkp_l4_sport4"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "acl_l4_dport"],
+              "target" : ["scalars", "userMetadata._lkp_l4_dport5"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "port_type",
-              "target" : ["scalars", "userMetadata._port_type50"],
+              "target" : ["scalars", "userMetadata._port_type64"],
               "mask" : null
             }
           ],
@@ -19814,13 +22240,13 @@
           "direct_meters" : null,
           "action_ids" : [42, 43, 44, 45, 46],
           "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_50",
+          "base_default_next" : "node_56",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_50",
-            "FabricIngress.acl.punt_to_cpu" : "node_50",
-            "FabricIngress.acl.set_clone_session_id" : "node_50",
-            "FabricIngress.acl.drop" : "node_50",
-            "FabricIngress.acl.nop_acl" : "node_50"
+            "FabricIngress.acl.set_next_id_acl" : "node_56",
+            "FabricIngress.acl.punt_to_cpu" : "node_56",
+            "FabricIngress.acl.set_clone_session_id" : "node_56",
+            "FabricIngress.acl.drop" : "node_56",
+            "FabricIngress.acl.nop_acl" : "node_56"
           },
           "default_entry" : {
             "action_id" : 46,
@@ -19831,7 +22257,7 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 28,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 68,
@@ -19848,7 +22274,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "userMetadata._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id21"],
               "mask" : null
             }
           ],
@@ -19875,7 +22301,7 @@
         },
         {
           "name" : "FabricIngress.next.simple",
-          "id" : 29,
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 101,
@@ -19886,7 +22312,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "userMetadata._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id21"],
               "mask" : null
             }
           ],
@@ -19913,7 +22339,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 30,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 138,
@@ -19924,7 +22350,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "userMetadata._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id21"],
               "mask" : null
             }
           ],
@@ -19946,7 +22372,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 31,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 171,
@@ -19957,7 +22383,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "userMetadata._next_id13"],
+              "target" : ["scalars", "userMetadata._next_id21"],
               "mask" : null
             }
           ],
@@ -19969,10 +22395,10 @@
           "direct_meters" : null,
           "action_ids" : [53, 13],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
-          "base_default_next" : "node_55",
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "FabricIngress.next.set_mcast_group_id" : "node_55",
-            "nop" : "node_55"
+            "FabricIngress.next.set_mcast_group_id" : "node_61",
+            "nop" : "node_61"
           },
           "default_entry" : {
             "action_id" : 13,
@@ -19983,7 +22409,7 @@
         },
         {
           "name" : "tbl_port_counter31",
-          "id" : 32,
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -19997,14 +22423,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
+          "action_ids" : [90],
           "actions" : ["port_counter31"],
-          "base_default_next" : "node_57",
+          "base_default_next" : "node_63",
           "next_tables" : {
-            "port_counter31" : "node_57"
+            "port_counter31" : "node_63"
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20012,7 +22438,7 @@
         },
         {
           "name" : "tbl_port_counter34",
-          "id" : 33,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -20026,14 +22452,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
+          "action_ids" : [91],
           "actions" : ["port_counter34"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
             "port_counter34" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20041,7 +22467,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 34,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -20078,7 +22504,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 35,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 67,
@@ -20101,10 +22527,10 @@
           "direct_meters" : null,
           "action_ids" : [17, 1],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
-          "base_default_next" : "node_61",
+          "base_default_next" : "node_67",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_61",
-            "nop" : "node_61"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_67",
+            "nop" : "node_67"
           },
           "default_entry" : {
             "action_id" : 1,
@@ -20115,7 +22541,7 @@
         },
         {
           "name" : "tbl_int_main89",
-          "id" : 36,
+          "id" : 39,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 89,
@@ -20129,14 +22555,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86],
+          "action_ids" : [92],
           "actions" : ["int_main89"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
             "int_main89" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20144,7 +22570,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.t_line_map",
-          "id" : 37,
+          "id" : 40,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 323,
@@ -20155,13 +22581,13 @@
             {
               "match_type" : "exact",
               "name" : "s_tag",
-              "target" : ["scalars", "userMetadata._bng_s_tag40"],
+              "target" : ["scalars", "userMetadata._bng_s_tag54"],
               "mask" : null
             },
             {
               "match_type" : "exact",
               "name" : "c_tag",
-              "target" : ["scalars", "userMetadata._bng_c_tag41"],
+              "target" : ["scalars", "userMetadata._bng_c_tag55"],
               "mask" : null
             }
           ],
@@ -20173,9 +22599,9 @@
           "direct_meters" : null,
           "action_ids" : [29],
           "actions" : ["FabricIngress.bng_ingress.set_line"],
-          "base_default_next" : "node_64",
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "FabricIngress.bng_ingress.set_line" : "node_64"
+            "FabricIngress.bng_ingress.set_line" : "node_70"
           },
           "default_entry" : {
             "action_id" : 29,
@@ -20186,7 +22612,7 @@
         },
         {
           "name" : "tbl_bng342",
-          "id" : 38,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 342,
@@ -20200,14 +22626,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
+          "action_ids" : [94],
           "actions" : ["bng342"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
           "next_tables" : {
             "bng342" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20215,7 +22641,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
-          "id" : 39,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 51,
@@ -20247,7 +22673,7 @@
           "base_default_next" : null,
           "next_tables" : {
             "__HIT__" : "tbl_bng126",
-            "__MISS__" : "node_68"
+            "__MISS__" : "node_74"
           },
           "default_entry" : {
             "action_id" : 2,
@@ -20258,7 +22684,7 @@
         },
         {
           "name" : "tbl_bng126",
-          "id" : 40,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 126,
@@ -20272,14 +22698,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
+          "action_ids" : [93],
           "actions" : ["bng126"],
-          "base_default_next" : "node_68",
+          "base_default_next" : "node_74",
           "next_tables" : {
-            "bng126" : "node_68"
+            "bng126" : "node_74"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20287,7 +22713,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "id" : 41,
+          "id" : 44,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 87,
@@ -20298,7 +22724,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "userMetadata._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id51"],
               "mask" : null
             },
             {
@@ -20322,10 +22748,10 @@
           "direct_meters" : null,
           "action_ids" : [21, 19],
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
             "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_bng131",
-            "FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
+            "FabricIngress.bng_ingress.upstream.term_enabled_v4" : "tbl_slicing114"
           },
           "default_entry" : {
             "action_id" : 19,
@@ -20336,7 +22762,7 @@
         },
         {
           "name" : "tbl_bng131",
-          "id" : 42,
+          "id" : 45,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 131,
@@ -20350,14 +22776,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89],
+          "action_ids" : [95],
           "actions" : ["bng131"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
-            "bng131" : null
+            "bng131" : "tbl_slicing114"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 95,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20365,7 +22791,7 @@
         },
         {
           "name" : "tbl_bng112",
-          "id" : 43,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 112,
@@ -20379,14 +22805,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
+          "action_ids" : [97],
           "actions" : ["bng112"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
           "next_tables" : {
             "bng112" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20394,7 +22820,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
-          "id" : 44,
+          "id" : 47,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 109,
@@ -20405,7 +22831,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "userMetadata._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id51"],
               "mask" : null
             },
             {
@@ -20429,10 +22855,10 @@
           "direct_meters" : null,
           "action_ids" : [22, 20],
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v6", "FabricIngress.bng_ingress.upstream.term_disabled"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
             "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_bng139",
-            "FabricIngress.bng_ingress.upstream.term_enabled_v6" : null
+            "FabricIngress.bng_ingress.upstream.term_enabled_v6" : "tbl_slicing114"
           },
           "default_entry" : {
             "action_id" : 20,
@@ -20443,7 +22869,7 @@
         },
         {
           "name" : "tbl_bng139",
-          "id" : 45,
+          "id" : 48,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 139,
@@ -20457,14 +22883,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90],
+          "action_ids" : [96],
           "actions" : ["bng139"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
-            "bng139" : null
+            "bng139" : "tbl_slicing114"
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 96,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20472,7 +22898,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
-          "id" : 46,
+          "id" : 49,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 169,
@@ -20483,7 +22909,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "userMetadata._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id51"],
               "mask" : null
             }
           ],
@@ -20497,8 +22923,8 @@
           "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__MISS__" : null,
-            "__HIT__" : "node_77"
+            "__HIT__" : "node_83",
+            "__MISS__" : "tbl_slicing114"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -20509,7 +22935,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "id" : 47,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 194,
@@ -20520,7 +22946,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "userMetadata._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id51"],
               "mask" : null
             },
             {
@@ -20550,7 +22976,7 @@
           "direct_meters" : null,
           "action_ids" : [25, 27],
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
             "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_bng238",
             "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_bng241"
@@ -20564,7 +22990,7 @@
         },
         {
           "name" : "tbl_bng238",
-          "id" : 48,
+          "id" : 51,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 238,
@@ -20578,14 +23004,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
+          "action_ids" : [98],
           "actions" : ["bng238"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
-            "bng238" : null
+            "bng238" : "tbl_slicing114"
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 98,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20593,7 +23019,7 @@
         },
         {
           "name" : "tbl_bng241",
-          "id" : 49,
+          "id" : 52,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 241,
@@ -20607,14 +23033,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
+          "action_ids" : [99],
           "actions" : ["bng241"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
-            "bng241" : null
+            "bng241" : "tbl_slicing114"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20622,7 +23048,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
-          "id" : 50,
+          "id" : 53,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 210,
@@ -20633,7 +23059,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "userMetadata._bng_line_id37"],
+              "target" : ["scalars", "userMetadata._bng_line_id51"],
               "mask" : null
             },
             {
@@ -20657,7 +23083,7 @@
           "direct_meters" : null,
           "action_ids" : [26, 28],
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
             "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_bng250",
             "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_bng253"
@@ -20671,7 +23097,7 @@
         },
         {
           "name" : "tbl_bng250",
-          "id" : 51,
+          "id" : 54,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 250,
@@ -20685,14 +23111,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
+          "action_ids" : [100],
           "actions" : ["bng250"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
-            "bng250" : null
+            "bng250" : "tbl_slicing114"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20700,7 +23126,7 @@
         },
         {
           "name" : "tbl_bng253",
-          "id" : 52,
+          "id" : 55,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 253,
@@ -20714,18 +23140,96 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
+          "action_ids" : [101],
           "actions" : ["bng253"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing114",
           "next_tables" : {
-            "bng253" : null
+            "bng253" : "tbl_slicing114"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 101,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
+        },
+        {
+          "name" : "tbl_slicing114",
+          "id" : 56,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 114,
+            "column" : 8,
+            "source_fragment" : "slice_tc_meter.execute_meter((bit<32>) slice_tc, fabric_md.packet_color); ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [102],
+          "actions" : ["slicing114"],
+          "base_default_next" : "FabricIngress.qos.queues",
+          "next_tables" : {
+            "slicing114" : "FabricIngress.qos.queues"
+          },
+          "default_entry" : {
+            "action_id" : 102,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.qos.queues",
+          "id" : 57,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 93,
+            "column" : 10,
+            "source_fragment" : "queues"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "slice_id",
+              "target" : ["scalars", "userMetadata._slice_id29"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "tc",
+              "target" : ["scalars", "userMetadata._tc31"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "color",
+              "target" : ["scalars", "userMetadata._packet_color30"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 128,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [56, 57],
+          "actions" : ["FabricIngress.qos.set_queue", "FabricIngress.qos.meter_drop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "FabricIngress.qos.set_queue" : null,
+            "FabricIngress.qos.meter_drop" : null
+          },
+          "default_entry" : {
+            "action_id" : 56,
+            "action_const" : true,
+            "action_data" : ["0x0"],
+            "action_entry_const" : true
+          }
         }
       ],
       "action_profiles" : [
@@ -20744,23 +23248,23 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._ipv4_src_addr19"]
+                "value" : ["scalars", "userMetadata._ipv4_src_addr27"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._ipv4_dst_addr20"]
+                "value" : ["scalars", "userMetadata._ipv4_dst_addr28"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._ip_proto16"]
+                "value" : ["scalars", "userMetadata._ip_proto24"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._l4_sport17"]
+                "value" : ["scalars", "userMetadata._l4_sport25"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._l4_dport18"]
+                "value" : ["scalars", "userMetadata._l4_dport26"]
               }
             ]
           }
@@ -20768,9 +23272,193 @@
       ],
       "conditionals" : [
         {
-          "name" : "node_2",
+          "name" : "node_3",
           "id" : 0,
           "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "hdr.inner_ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["inner_ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init32",
+          "false_next" : "node_11"
+        },
+        {
+          "name" : "node_5",
+          "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 36,
+            "column" : 16,
+            "source_fragment" : "hdr.inner_tcp.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["inner_tcp", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init37",
+          "false_next" : "node_7"
+        },
+        {
+          "name" : "node_7",
+          "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 39,
+            "column" : 23,
+            "source_fragment" : "hdr.inner_udp.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["inner_udp", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init40",
+          "false_next" : "node_9"
+        },
+        {
+          "name" : "node_9",
+          "id" : 3,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 42,
+            "column" : 23,
+            "source_fragment" : "hdr.inner_icmp.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["inner_icmp", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init43",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_11",
+          "id" : 4,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 46,
+            "column" : 19,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init47",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_13",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 51,
+            "column" : 16,
+            "source_fragment" : "hdr.tcp.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["tcp", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init52",
+          "false_next" : "node_15"
+        },
+        {
+          "name" : "node_15",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 54,
+            "column" : 23,
+            "source_fragment" : "hdr.udp.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["udp", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init55",
+          "false_next" : "node_17"
+        },
+        {
+          "name" : "node_17",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/lookup_md_init.p4",
+            "line" : 57,
+            "column" : 23,
+            "source_fragment" : "hdr.icmp.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["icmp", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_lookup_md_init58",
+          "false_next" : "node_19"
+        },
+        {
+          "name" : "node_19",
+          "id" : 8,
+          "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 24,
             "column" : 12,
@@ -20788,109 +23476,11 @@
             }
           },
           "true_next" : "tbl_packetio25",
-          "false_next" : "FabricIngress.spgw.interfaces"
+          "false_next" : "FabricIngress.slice_tc_classifier.classifier"
         },
         {
-          "name" : "node_5",
-          "id" : 1,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "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", "userMetadata._spgw_src_iface30"]
-              },
-              "right" : {
-                "type" : "hexstr",
-                "value" : "0x03"
-              }
-            }
-          },
-          "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
-          "false_next" : "node_7"
-        },
-        {
-          "name" : "node_7",
-          "id" : 2,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 259,
-            "column" : 16,
-            "source_fragment" : "hdr.gtpu.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["gtpu", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "FabricIngress.spgw.uplink_pdrs",
-          "false_next" : "FabricIngress.spgw.downlink_pdrs"
-        },
-        {
-          "name" : "node_10",
-          "id" : 3,
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 264,
-            "column" : 16,
-            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "!=",
-              "left" : {
-                "type" : "field",
-                "value" : ["scalars", "userMetadata._spgw_src_iface30"]
-              },
-              "right" : {
-                "type" : "hexstr",
-                "value" : "0x03"
-              }
-            }
-          },
-          "true_next" : "tbl_spgw265",
-          "false_next" : "node_12"
-        },
-        {
-          "name" : "node_12",
-          "id" : 4,
-          "source_info" : {
-            "filename" : "fabric.p4",
-            "line" : 68,
-            "column" : 24,
-            "source_fragment" : "fabric_metadata"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap34"]
-              }
-            }
-          },
-          "true_next" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
-          "false_next" : "FabricIngress.spgw.fars"
-        },
-        {
-          "name" : "node_16",
-          "id" : 5,
+          "name" : "node_22",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 112,
@@ -20909,11 +23499,11 @@
             }
           },
           "true_next" : "tbl_filtering113",
-          "false_next" : "node_18"
+          "false_next" : "node_24"
         },
         {
-          "name" : "node_18",
-          "id" : 6,
+          "name" : "node_24",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 118,
@@ -20932,11 +23522,11 @@
             }
           },
           "true_next" : "tbl_filtering119",
-          "false_next" : "node_20"
+          "false_next" : "node_26"
         },
         {
-          "name" : "node_20",
-          "id" : 7,
+          "name" : "node_26",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 124,
@@ -20965,11 +23555,11 @@
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
-          "name" : "node_24",
-          "id" : 8,
+          "name" : "node_30",
+          "id" : 12,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 76,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding"
           },
@@ -20985,18 +23575,146 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._skip_forwarding10"]
+                    "value" : ["scalars", "userMetadata._skip_forwarding18"]
                   }
                 }
               }
             }
           },
-          "true_next" : "node_25",
-          "false_next" : "node_33"
+          "true_next" : "FabricIngress.spgw.interfaces",
+          "false_next" : "node_43"
         },
         {
-          "name" : "node_25",
-          "id" : 9,
+          "name" : "node_32",
+          "id" : 13,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 267,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface == SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_src_iface42"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_gtpu",
+          "false_next" : "node_34"
+        },
+        {
+          "name" : "node_34",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 271,
+            "column" : 16,
+            "source_fragment" : "hdr.gtpu.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["gtpu", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.spgw.uplink_pdrs",
+          "false_next" : "FabricIngress.spgw.downlink_pdrs"
+        },
+        {
+          "name" : "node_37",
+          "id" : 15,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 276,
+            "column" : 16,
+            "source_fragment" : "fabric_md.spgw.src_iface != SPGW_IFACE_FROM_DBUF"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_src_iface42"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "tbl_spgw277",
+          "false_next" : "node_39"
+        },
+        {
+          "name" : "node_39",
+          "id" : 16,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 77,
+            "column" : 28,
+            "source_fragment" : "fabric_metadata"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap47"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.spgw.decap_gtpu.decap_gtpu",
+          "false_next" : "FabricIngress.spgw.fars"
+        },
+        {
+          "name" : "node_43",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 80,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata._skip_forwarding18"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_44",
+          "false_next" : "node_52"
+        },
+        {
+          "name" : "node_44",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 150,
@@ -21009,7 +23727,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type20"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -21018,11 +23736,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_27"
+          "false_next" : "node_46"
         },
         {
-          "name" : "node_27",
-          "id" : 10,
+          "name" : "node_46",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 151,
@@ -21035,7 +23753,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type20"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -21044,11 +23762,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_29"
+          "false_next" : "node_48"
         },
         {
-          "name" : "node_29",
-          "id" : 11,
+          "name" : "node_48",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 152,
@@ -21061,7 +23779,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type20"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -21070,11 +23788,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "node_31"
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_31",
-          "id" : 12,
+          "name" : "node_50",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 154,
@@ -21087,7 +23805,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._fwd_type12"]
+                "value" : ["scalars", "userMetadata._fwd_type20"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -21096,14 +23814,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v6",
-          "false_next" : "node_33"
+          "false_next" : "node_52"
         },
         {
-          "name" : "node_33",
-          "id" : 13,
+          "name" : "node_52",
+          "id" : 22,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 74,
+            "line" : 83,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next"
           },
@@ -21119,176 +23837,21 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._skip_next11"]
+                    "value" : ["scalars", "userMetadata._skip_next19"]
                   }
                 }
               }
             }
           },
           "true_next" : "FabricIngress.pre_next.next_mpls",
-          "false_next" : "tbl_acl27"
-        },
-        {
-          "name" : "node_37",
-          "id" : 14,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 97,
-            "column" : 12,
-            "source_fragment" : "hdr.gtpu.isValid() && hdr.inner_ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["gtpu", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["inner_ipv4", "$valid$"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_acl98",
-          "false_next" : "node_43"
-        },
-        {
-          "name" : "node_39",
-          "id" : 15,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 101,
-            "column" : 16,
-            "source_fragment" : "hdr.inner_tcp.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["inner_tcp", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_acl102",
-          "false_next" : "node_41"
-        },
-        {
-          "name" : "node_41",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 104,
-            "column" : 23,
-            "source_fragment" : "hdr.inner_udp.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["inner_udp", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_acl105",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_43",
-          "id" : 17,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 108,
-            "column" : 19,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_acl109",
-          "false_next" : "FabricIngress.acl.acl"
-        },
-        {
-          "name" : "node_45",
-          "id" : 18,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 112,
-            "column" : 16,
-            "source_fragment" : "hdr.tcp.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["tcp", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_acl113",
-          "false_next" : "node_47"
-        },
-        {
-          "name" : "node_47",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/acl.p4",
-            "line" : 115,
-            "column" : 23,
-            "source_fragment" : "hdr.udp.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["udp", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_acl116",
-          "false_next" : "FabricIngress.acl.acl"
-        },
-        {
-          "name" : "node_50",
-          "id" : 20,
+          "name" : "node_56",
+          "id" : 23,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 78,
+            "line" : 87,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next"
           },
@@ -21304,7 +23867,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._skip_next11"]
+                    "value" : ["scalars", "userMetadata._skip_next19"]
                   }
                 }
               }
@@ -21314,8 +23877,8 @@
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
-          "name" : "node_55",
-          "id" : 21,
+          "name" : "node_61",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -21337,11 +23900,11 @@
             }
           },
           "true_next" : "tbl_port_counter31",
-          "false_next" : "node_57"
+          "false_next" : "node_63"
         },
         {
-          "name" : "node_57",
-          "id" : 22,
+          "name" : "node_63",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -21366,11 +23929,11 @@
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_61",
-          "id" : 23,
+          "name" : "node_67",
+          "id" : 26,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 86,
+            "line" : 95,
             "column" : 47,
             "source_fragment" : "fabric_metadata"
           },
@@ -21381,7 +23944,7 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._int_meta_sink44"]
+                "value" : ["scalars", "userMetadata._int_meta_sink58"]
               }
             }
           },
@@ -21389,8 +23952,8 @@
           "false_next" : "FabricIngress.bng_ingress.t_line_map"
         },
         {
-          "name" : "node_64",
-          "id" : 24,
+          "name" : "node_70",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 341,
@@ -21412,8 +23975,8 @@
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
-          "name" : "node_68",
-          "id" : 25,
+          "name" : "node_74",
+          "id" : 28,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -21432,12 +23995,12 @@
               }
             }
           },
-          "false_next" : null,
-          "true_next" : "node_69"
+          "true_next" : "node_75",
+          "false_next" : "tbl_slicing114"
         },
         {
-          "name" : "node_69",
-          "id" : 26,
+          "name" : "node_75",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 128,
@@ -21456,11 +24019,11 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "false_next" : "node_72"
+          "false_next" : "node_78"
         },
         {
-          "name" : "node_72",
-          "id" : 27,
+          "name" : "node_78",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 136,
@@ -21478,12 +24041,12 @@
               }
             }
           },
-          "false_next" : null,
-          "true_next" : "tbl_bng112"
+          "true_next" : "tbl_bng112",
+          "false_next" : "tbl_slicing114"
         },
         {
-          "name" : "node_77",
-          "id" : 28,
+          "name" : "node_83",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 235,
@@ -21502,11 +24065,11 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "false_next" : "node_81"
+          "false_next" : "node_87"
         },
         {
-          "name" : "node_81",
-          "id" : 29,
+          "name" : "node_87",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 247,
@@ -21524,8 +24087,8 @@
               }
             }
           },
-          "false_next" : null,
-          "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v6"
+          "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
+          "false_next" : "tbl_slicing114"
         }
       ]
     },
@@ -21534,15 +24097,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 96,
+        "line" : 105,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_87",
+      "init_table" : "node_95",
       "tables" : [
         {
           "name" : "tbl_packetio41",
-          "id" : 53,
+          "id" : 58,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -21556,14 +24119,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
+          "action_ids" : [159],
           "actions" : ["packetio41"],
-          "base_default_next" : "node_89",
+          "base_default_next" : "node_97",
           "next_tables" : {
-            "packetio41" : "node_89"
+            "packetio41" : "node_97"
           },
           "default_entry" : {
-            "action_id" : 148,
+            "action_id" : 159,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21571,7 +24134,7 @@
         },
         {
           "name" : "tbl_packetio44",
-          "id" : 54,
+          "id" : 59,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -21585,14 +24148,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149],
+          "action_ids" : [160],
           "actions" : ["packetio44"],
-          "base_default_next" : "node_91",
+          "base_default_next" : "node_99",
           "next_tables" : {
-            "packetio44" : "node_91"
+            "packetio44" : "node_99"
           },
           "default_entry" : {
-            "action_id" : 149,
+            "action_id" : 160,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21600,7 +24163,7 @@
         },
         {
           "name" : "tbl_next283",
-          "id" : 55,
+          "id" : 60,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 283,
@@ -21614,14 +24177,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [150],
+          "action_ids" : [161],
           "actions" : ["next283"],
-          "base_default_next" : "node_93",
+          "base_default_next" : "node_101",
           "next_tables" : {
-            "next283" : "node_93"
+            "next283" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 150,
+            "action_id" : 161,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21629,7 +24192,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 56,
+          "id" : 61,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 287,
@@ -21643,14 +24206,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [140],
+          "action_ids" : [148],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
-          "base_default_next" : "node_97",
+          "base_default_next" : "node_105",
           "next_tables" : {
-            "FabricEgress.egress_next.pop_mpls_if_present" : "node_97"
+            "FabricEgress.egress_next.pop_mpls_if_present" : "node_105"
           },
           "default_entry" : {
-            "action_id" : 140,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21658,7 +24221,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 57,
+          "id" : 62,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 289,
@@ -21672,14 +24235,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [141],
+          "action_ids" : [149],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
-          "base_default_next" : "node_97",
+          "base_default_next" : "node_105",
           "next_tables" : {
-            "FabricEgress.egress_next.set_mpls" : "node_97"
+            "FabricEgress.egress_next.set_mpls" : "node_105"
           },
           "default_entry" : {
-            "action_id" : 141,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21687,7 +24250,7 @@
         },
         {
           "name" : "tbl_egress_next_push_outer_vlan",
-          "id" : 58,
+          "id" : 63,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 295,
@@ -21701,14 +24264,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [142],
+          "action_ids" : [150],
           "actions" : ["FabricEgress.egress_next.push_outer_vlan"],
           "base_default_next" : "tbl_egress_next_push_inner_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.push_outer_vlan" : "tbl_egress_next_push_inner_vlan"
           },
           "default_entry" : {
-            "action_id" : 142,
+            "action_id" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21716,7 +24279,7 @@
         },
         {
           "name" : "tbl_egress_next_push_inner_vlan",
-          "id" : 59,
+          "id" : 64,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 296,
@@ -21730,14 +24293,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [143],
+          "action_ids" : [151],
           "actions" : ["FabricEgress.egress_next.push_inner_vlan"],
-          "base_default_next" : "node_102",
+          "base_default_next" : "node_110",
           "next_tables" : {
-            "FabricEgress.egress_next.push_inner_vlan" : "node_102"
+            "FabricEgress.egress_next.push_inner_vlan" : "node_110"
           },
           "default_entry" : {
-            "action_id" : 143,
+            "action_id" : 151,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21745,7 +24308,7 @@
         },
         {
           "name" : "tbl_next299",
-          "id" : 60,
+          "id" : 65,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 299,
@@ -21759,14 +24322,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [151],
+          "action_ids" : [162],
           "actions" : ["next299"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "next299" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 151,
+            "action_id" : 162,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21774,7 +24337,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 61,
+          "id" : 66,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 265,
@@ -21785,7 +24348,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "userMetadata._vlan_id1"],
+              "target" : ["scalars", "userMetadata._vlan_id9"],
               "mask" : null
             },
             {
@@ -21801,16 +24364,16 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [144, 145, 146],
+          "action_ids" : [152, 153, 154],
           "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
-          "base_default_next" : "node_102",
+          "base_default_next" : "node_110",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_102",
-            "FabricEgress.egress_next.pop_vlan" : "node_102",
-            "FabricEgress.egress_next.drop" : "node_102"
+            "FabricEgress.egress_next.push_vlan" : "node_110",
+            "FabricEgress.egress_next.pop_vlan" : "node_110",
+            "FabricEgress.egress_next.drop" : "node_110"
           },
           "default_entry" : {
-            "action_id" : 146,
+            "action_id" : 154,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21818,7 +24381,7 @@
         },
         {
           "name" : "tbl_next309",
-          "id" : 62,
+          "id" : 67,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 309,
@@ -21832,14 +24395,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
+          "action_ids" : [164],
           "actions" : ["next309"],
-          "base_default_next" : "node_104",
+          "base_default_next" : "node_112",
           "next_tables" : {
-            "next309" : "node_104"
+            "next309" : "node_112"
           },
           "default_entry" : {
-            "action_id" : 153,
+            "action_id" : 164,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21847,7 +24410,7 @@
         },
         {
           "name" : "tbl_next310",
-          "id" : 63,
+          "id" : 68,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 310,
@@ -21861,14 +24424,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [152],
+          "action_ids" : [163],
           "actions" : ["next310"],
-          "base_default_next" : "node_114",
+          "base_default_next" : "node_122",
           "next_tables" : {
-            "next310" : "node_114"
+            "next310" : "node_122"
           },
           "default_entry" : {
-            "action_id" : 152,
+            "action_id" : 163,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21876,7 +24439,7 @@
         },
         {
           "name" : "tbl_next313",
-          "id" : 64,
+          "id" : 69,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 313,
@@ -21890,14 +24453,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
+          "action_ids" : [166],
           "actions" : ["next313"],
-          "base_default_next" : "node_108",
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "next313" : "node_108"
+            "next313" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 155,
+            "action_id" : 166,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21905,7 +24468,7 @@
         },
         {
           "name" : "tbl_next314",
-          "id" : 65,
+          "id" : 70,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -21919,14 +24482,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
+          "action_ids" : [165],
           "actions" : ["next314"],
-          "base_default_next" : "node_114",
+          "base_default_next" : "node_122",
           "next_tables" : {
-            "next314" : "node_114"
+            "next314" : "node_122"
           },
           "default_entry" : {
-            "action_id" : 154,
+            "action_id" : 165,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21934,7 +24497,7 @@
         },
         {
           "name" : "tbl_next318",
-          "id" : 66,
+          "id" : 71,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 318,
@@ -21948,14 +24511,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [157],
+          "action_ids" : [168],
           "actions" : ["next318"],
-          "base_default_next" : "node_112",
+          "base_default_next" : "node_120",
           "next_tables" : {
-            "next318" : "node_112"
+            "next318" : "node_120"
           },
           "default_entry" : {
-            "action_id" : 157,
+            "action_id" : 168,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21963,7 +24526,7 @@
         },
         {
           "name" : "tbl_next319",
-          "id" : 67,
+          "id" : 72,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -21977,14 +24540,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
+          "action_ids" : [167],
           "actions" : ["next319"],
-          "base_default_next" : "node_114",
+          "base_default_next" : "node_122",
           "next_tables" : {
-            "next319" : "node_114"
+            "next319" : "node_122"
           },
           "default_entry" : {
-            "action_id" : 156,
+            "action_id" : 167,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_gtpu_encap_qfi",
+          "id" : 73,
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 371,
+            "column" : 20,
+            "source_fragment" : "gtpu_encap_qfi()"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [158],
+          "actions" : ["FabricEgress.spgw.gtpu_encap_qfi"],
+          "base_default_next" : "node_127",
+          "next_tables" : {
+            "FabricEgress.spgw.gtpu_encap_qfi" : "node_127"
+          },
+          "default_entry" : {
+            "action_id" : 158,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -21992,11 +24584,11 @@
         },
         {
           "name" : "tbl_spgw_gtpu_encap",
-          "id" : 68,
+          "id" : 74,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 339,
-            "column" : 16,
+            "line" : 373,
+            "column" : 20,
             "source_fragment" : "gtpu_encap()"
           },
           "key" : [],
@@ -22006,25 +24598,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
+          "action_ids" : [157],
           "actions" : ["FabricEgress.spgw.gtpu_encap"],
-          "base_default_next" : "node_117",
+          "base_default_next" : "node_127",
           "next_tables" : {
-            "FabricEgress.spgw.gtpu_encap" : "node_117"
+            "FabricEgress.spgw.gtpu_encap" : "node_127"
           },
           "default_entry" : {
-            "action_id" : 147,
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_spgw342",
-          "id" : 69,
+          "name" : "tbl_spgw377",
+          "id" : 75,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 342,
+            "line" : 377,
             "column" : 16,
             "source_fragment" : "pdr_counter.count(fabric_md.spgw.ctr_id)"
           },
@@ -22035,14 +24627,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["spgw342"],
-          "base_default_next" : "node_119",
+          "action_ids" : [169],
+          "actions" : ["spgw377"],
+          "base_default_next" : "node_129",
           "next_tables" : {
-            "spgw342" : "node_119"
+            "spgw377" : "node_129"
           },
           "default_entry" : {
-            "action_id" : 158,
+            "action_id" : 169,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22050,7 +24642,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 70,
+          "id" : 76,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 297,
@@ -22064,14 +24656,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [101],
+          "action_ids" : [109],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
-          "base_default_next" : "node_124",
+          "base_default_next" : "node_134",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v4" : "node_124"
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_134"
           },
           "default_entry" : {
-            "action_id" : 101,
+            "action_id" : 109,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22079,7 +24671,7 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v6",
-          "id" : 71,
+          "id" : 77,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 302,
@@ -22093,14 +24685,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [102],
+          "action_ids" : [110],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v6"],
-          "base_default_next" : "node_124",
+          "base_default_next" : "node_134",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v6" : "node_124"
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_134"
           },
           "default_entry" : {
-            "action_id" : 102,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22108,7 +24700,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 72,
+          "id" : 78,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -22131,13 +24723,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "userMetadata._l4_sport17"],
+              "target" : ["scalars", "userMetadata._l4_sport25"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "userMetadata._l4_dport18"],
+              "target" : ["scalars", "userMetadata._l4_dport26"],
               "mask" : null
             }
           ],
@@ -22147,15 +24739,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [103, 96],
+          "action_ids" : [111, 103],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_127",
+          "base_default_next" : "node_137",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_127",
-            "nop" : "node_127"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_137",
+            "nop" : "node_137"
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 103,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22163,7 +24755,7 @@
         },
         {
           "name" : "tbl_act",
-          "id" : 73,
+          "id" : 79,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -22171,14 +24763,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [159],
+          "action_ids" : [170],
           "actions" : ["act"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
             "act" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 159,
+            "action_id" : 170,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22186,7 +24778,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 74,
+          "id" : 80,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -22207,15 +24799,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104, 97],
+          "action_ids" : [112, 104],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_130",
+          "base_default_next" : "node_140",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_130",
-            "nop" : "node_130"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_140",
+            "nop" : "node_140"
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 104,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22223,7 +24815,7 @@
         },
         {
           "name" : "tbl_int_transit420",
-          "id" : 75,
+          "id" : 81,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -22237,14 +24829,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [160],
+          "action_ids" : [171],
           "actions" : ["int_transit420"],
-          "base_default_next" : "node_132",
+          "base_default_next" : "node_142",
           "next_tables" : {
-            "int_transit420" : "node_132"
+            "int_transit420" : "node_142"
           },
           "default_entry" : {
-            "action_id" : 160,
+            "action_id" : 171,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22252,7 +24844,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 76,
+          "id" : 82,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -22273,7 +24865,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 99],
+          "action_ids" : [113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 107],
           "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" : {
@@ -22296,7 +24888,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 107,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -22316,7 +24908,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 1
@@ -22335,7 +24927,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 2
@@ -22354,7 +24946,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 3
@@ -22373,7 +24965,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 4
@@ -22392,7 +24984,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 5
@@ -22411,7 +25003,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 6
@@ -22430,7 +25022,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 7
@@ -22449,7 +25041,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 8
@@ -22468,7 +25060,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 9
@@ -22487,7 +25079,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 10
@@ -22506,7 +25098,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 11
@@ -22525,7 +25117,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 12
@@ -22544,7 +25136,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 13
@@ -22563,7 +25155,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 118,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 14
@@ -22582,7 +25174,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 119,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 15
@@ -22601,7 +25193,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 120,
+                "action_id" : 128,
                 "action_data" : []
               },
               "priority" : 16
@@ -22610,7 +25202,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 77,
+          "id" : 83,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -22631,7 +25223,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 100],
+          "action_ids" : [129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 108],
           "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_int_transit425",
           "next_tables" : {
@@ -22654,7 +25246,7 @@
             "NoAction" : "tbl_int_transit425"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 108,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -22674,7 +25266,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 121,
+                "action_id" : 129,
                 "action_data" : []
               },
               "priority" : 1
@@ -22693,7 +25285,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 122,
+                "action_id" : 130,
                 "action_data" : []
               },
               "priority" : 2
@@ -22712,7 +25304,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 123,
+                "action_id" : 131,
                 "action_data" : []
               },
               "priority" : 3
@@ -22731,7 +25323,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 124,
+                "action_id" : 132,
                 "action_data" : []
               },
               "priority" : 4
@@ -22750,7 +25342,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 125,
+                "action_id" : 133,
                 "action_data" : []
               },
               "priority" : 5
@@ -22769,7 +25361,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 126,
+                "action_id" : 134,
                 "action_data" : []
               },
               "priority" : 6
@@ -22788,7 +25380,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 127,
+                "action_id" : 135,
                 "action_data" : []
               },
               "priority" : 7
@@ -22807,7 +25399,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 128,
+                "action_id" : 136,
                 "action_data" : []
               },
               "priority" : 8
@@ -22826,7 +25418,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 129,
+                "action_id" : 137,
                 "action_data" : []
               },
               "priority" : 9
@@ -22845,7 +25437,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 130,
+                "action_id" : 138,
                 "action_data" : []
               },
               "priority" : 10
@@ -22864,7 +25456,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 131,
+                "action_id" : 139,
                 "action_data" : []
               },
               "priority" : 11
@@ -22883,7 +25475,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 132,
+                "action_id" : 140,
                 "action_data" : []
               },
               "priority" : 12
@@ -22902,7 +25494,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 133,
+                "action_id" : 141,
                 "action_data" : []
               },
               "priority" : 13
@@ -22921,7 +25513,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 134,
+                "action_id" : 142,
                 "action_data" : []
               },
               "priority" : 14
@@ -22940,7 +25532,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 135,
+                "action_id" : 143,
                 "action_data" : []
               },
               "priority" : 15
@@ -22959,7 +25551,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 136,
+                "action_id" : 144,
                 "action_data" : []
               },
               "priority" : 16
@@ -22968,7 +25560,7 @@
         },
         {
           "name" : "tbl_int_transit425",
-          "id" : 78,
+          "id" : 84,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -22982,14 +25574,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [162],
+          "action_ids" : [173],
           "actions" : ["int_transit425"],
-          "base_default_next" : "node_136",
+          "base_default_next" : "node_146",
           "next_tables" : {
-            "int_transit425" : "node_136"
+            "int_transit425" : "node_146"
           },
           "default_entry" : {
-            "action_id" : 162,
+            "action_id" : 173,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -22997,7 +25589,7 @@
         },
         {
           "name" : "tbl_int_transit428",
-          "id" : 79,
+          "id" : 85,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -23011,14 +25603,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [161],
+          "action_ids" : [172],
           "actions" : ["int_transit428"],
-          "base_default_next" : "node_138",
+          "base_default_next" : "node_148",
           "next_tables" : {
-            "int_transit428" : "node_138"
+            "int_transit428" : "node_148"
           },
           "default_entry" : {
-            "action_id" : 161,
+            "action_id" : 172,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -23026,7 +25618,7 @@
         },
         {
           "name" : "tbl_int_transit431",
-          "id" : 80,
+          "id" : 86,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -23040,14 +25632,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [163],
+          "action_ids" : [174],
           "actions" : ["int_transit431"],
-          "base_default_next" : "node_140",
+          "base_default_next" : "node_150",
           "next_tables" : {
-            "int_transit431" : "node_140"
+            "int_transit431" : "node_150"
           },
           "default_entry" : {
-            "action_id" : 163,
+            "action_id" : 174,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -23055,7 +25647,7 @@
         },
         {
           "name" : "tbl_int_transit434",
-          "id" : 81,
+          "id" : 87,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -23069,14 +25661,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [164],
+          "action_ids" : [175],
           "actions" : ["int_transit434"],
-          "base_default_next" : "node_142",
+          "base_default_next" : "node_152",
           "next_tables" : {
-            "int_transit434" : "node_142"
+            "int_transit434" : "node_152"
           },
           "default_entry" : {
-            "action_id" : 164,
+            "action_id" : 175,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -23084,7 +25676,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 82,
+          "id" : 88,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 87,
@@ -23098,15 +25690,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [137, 98],
+          "action_ids" : [145, 105],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_144",
+          "base_default_next" : "node_154",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_144",
-            "nop" : "node_144"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_154",
+            "nop" : "node_154"
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 105,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -23114,7 +25706,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 83,
+          "id" : 89,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -23128,14 +25720,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [138],
+          "action_ids" : [146],
           "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" : 138,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -23143,7 +25735,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 84,
+          "id" : 90,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -23157,14 +25749,138 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [139],
+          "action_ids" : [147],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
-          "base_default_next" : null,
+          "base_default_next" : "tbl_slicing126",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_sink.int_sink" : null
+            "FabricEgress.process_int_main.process_int_sink.int_sink" : "tbl_slicing126"
           },
           "default_entry" : {
-            "action_id" : 139,
+            "action_id" : 147,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_slicing126",
+          "id" : 91,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 126,
+            "column" : 4,
+            "source_fragment" : "bit<6> tmp_dscp = fabric_md.dscp;"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [178],
+          "actions" : ["slicing126"],
+          "base_default_next" : "FabricEgress.dscp_rewriter.rewriter",
+          "next_tables" : {
+            "slicing126" : "FabricEgress.dscp_rewriter.rewriter"
+          },
+          "default_entry" : {
+            "action_id" : 178,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricEgress.dscp_rewriter.rewriter",
+          "id" : 92,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 138,
+            "column" : 10,
+            "source_fragment" : "rewriter"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "eg_port",
+              "target" : ["standard_metadata", "egress_port"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 512,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [155, 156, 106],
+          "actions" : ["FabricEgress.dscp_rewriter.rewrite", "FabricEgress.dscp_rewriter.clear", "nop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__MISS__" : null,
+            "__HIT__" : "node_159"
+          },
+          "default_entry" : {
+            "action_id" : 106,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_slicing155",
+          "id" : 93,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 155,
+            "column" : 30,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [176],
+          "actions" : ["slicing155"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "slicing155" : null
+          },
+          "default_entry" : {
+            "action_id" : 176,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_slicing159",
+          "id" : 94,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 159,
+            "column" : 36,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [177],
+          "actions" : ["slicing159"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "slicing159" : null
+          },
+          "default_entry" : {
+            "action_id" : 177,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -23174,11 +25890,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_87",
-          "id" : 30,
+          "name" : "node_95",
+          "id" : 33,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 108,
+            "line" : 118,
             "column" : 33,
             "source_fragment" : "fabric_metadata"
           },
@@ -23189,16 +25905,16 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._is_controller_packet_out15"]
+                "value" : ["scalars", "userMetadata._is_controller_packet_out23"]
               }
             }
           },
           "true_next" : "tbl_packetio41",
-          "false_next" : "node_89"
+          "false_next" : "node_97"
         },
         {
-          "name" : "node_89",
-          "id" : 31,
+          "name" : "node_97",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -23220,11 +25936,11 @@
             }
           },
           "true_next" : "tbl_packetio44",
-          "false_next" : "node_91"
+          "false_next" : "node_99"
         },
         {
-          "name" : "node_91",
-          "id" : 32,
+          "name" : "node_99",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 281,
@@ -23242,7 +25958,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._is_multicast14"]
+                    "value" : ["scalars", "userMetadata._is_multicast22"]
                   }
                 }
               },
@@ -23263,11 +25979,11 @@
             }
           },
           "true_next" : "tbl_next283",
-          "false_next" : "node_93"
+          "false_next" : "node_101"
         },
         {
-          "name" : "node_93",
-          "id" : 33,
+          "name" : "node_101",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 286,
@@ -23280,7 +25996,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._mpls_label8"]
+                "value" : ["scalars", "userMetadata._mpls_label16"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -23288,12 +26004,12 @@
               }
             }
           },
-          "true_next" : "node_94",
+          "true_next" : "node_102",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_94",
-          "id" : 34,
+          "name" : "node_102",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 287,
@@ -23312,14 +26028,14 @@
             }
           },
           "true_next" : "tbl_egress_next_pop_mpls_if_present",
-          "false_next" : "node_97"
+          "false_next" : "node_105"
         },
         {
-          "name" : "node_97",
-          "id" : 35,
+          "name" : "node_105",
+          "id" : 38,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 109,
+            "line" : 119,
             "column" : 31,
             "source_fragment" : "fabric_metadata"
           },
@@ -23330,7 +26046,7 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._push_double_vlan4"]
+                "value" : ["scalars", "userMetadata._push_double_vlan12"]
               }
             }
           },
@@ -23338,8 +26054,8 @@
           "false_next" : "tbl_next299"
         },
         {
-          "name" : "node_102",
-          "id" : 36,
+          "name" : "node_110",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 308,
@@ -23358,11 +26074,11 @@
             }
           },
           "true_next" : "tbl_next309",
-          "false_next" : "node_106"
+          "false_next" : "node_114"
         },
         {
-          "name" : "node_104",
-          "id" : 37,
+          "name" : "node_112",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 310,
@@ -23384,11 +26100,11 @@
             }
           },
           "true_next" : "tbl_next310",
-          "false_next" : "node_114"
+          "false_next" : "node_122"
         },
         {
-          "name" : "node_106",
-          "id" : 38,
+          "name" : "node_114",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -23416,7 +26132,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._fwd_type12"]
+                    "value" : ["scalars", "userMetadata._fwd_type20"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -23427,11 +26143,11 @@
             }
           },
           "true_next" : "tbl_next313",
-          "false_next" : "node_110"
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_108",
-          "id" : 39,
+          "name" : "node_116",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -23453,11 +26169,11 @@
             }
           },
           "true_next" : "tbl_next314",
-          "false_next" : "node_114"
+          "false_next" : "node_122"
         },
         {
-          "name" : "node_110",
-          "id" : 40,
+          "name" : "node_118",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -23485,7 +26201,7 @@
                   "op" : "!=",
                   "left" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._fwd_type12"]
+                    "value" : ["scalars", "userMetadata._fwd_type20"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -23496,11 +26212,11 @@
             }
           },
           "true_next" : "tbl_next318",
-          "false_next" : "node_114"
+          "false_next" : "node_122"
         },
         {
-          "name" : "node_112",
-          "id" : 41,
+          "name" : "node_120",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -23522,14 +26238,14 @@
             }
           },
           "true_next" : "tbl_next319",
-          "false_next" : "node_114"
+          "false_next" : "node_122"
         },
         {
-          "name" : "node_114",
-          "id" : 42,
+          "name" : "node_122",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 337,
+            "line" : 368,
             "column" : 12,
             "source_fragment" : "fabric_md.spgw.skip_spgw"
           },
@@ -23545,21 +26261,21 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._spgw_skip_spgw31"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_spgw44"]
                   }
                 }
               }
             }
           },
-          "true_next" : "node_115",
-          "false_next" : "node_119"
+          "true_next" : "node_123",
+          "false_next" : "node_129"
         },
         {
-          "name" : "node_115",
-          "id" : 43,
+          "name" : "node_123",
+          "id" : 46,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 111,
+            "line" : 121,
             "column" : 24,
             "source_fragment" : "fabric_metadata"
           },
@@ -23570,19 +26286,42 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap33"]
+                "value" : ["scalars", "userMetadata._spgw_needs_gtpu_encap46"]
               }
             }
           },
-          "true_next" : "tbl_spgw_gtpu_encap",
-          "false_next" : "node_117"
+          "true_next" : "node_124",
+          "false_next" : "node_127"
         },
         {
-          "name" : "node_117",
-          "id" : 44,
+          "name" : "node_124",
+          "id" : 47,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 121,
+            "column" : 24,
+            "source_fragment" : "fabric_metadata"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "userMetadata._spgw_needs_qfi_push49"]
+              }
+            }
+          },
+          "true_next" : "tbl_spgw_gtpu_encap_qfi",
+          "false_next" : "tbl_spgw_gtpu_encap"
+        },
+        {
+          "name" : "node_127",
+          "id" : 48,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
-            "line" : 341,
+            "line" : 376,
             "column" : 16,
             "source_fragment" : "fabric_md.spgw.skip_egress_pdr_ctr"
           },
@@ -23598,18 +26337,18 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr35"]
+                    "value" : ["scalars", "userMetadata._spgw_skip_egress_pdr_ctr48"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_spgw342",
-          "false_next" : "node_119"
+          "true_next" : "tbl_spgw377",
+          "false_next" : "node_129"
         },
         {
-          "name" : "node_119",
-          "id" : 45,
+          "name" : "node_129",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 358,
@@ -23622,7 +26361,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._bng_type36"]
+                "value" : ["scalars", "userMetadata._bng_type50"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -23630,12 +26369,12 @@
               }
             }
           },
-          "true_next" : "node_120",
-          "false_next" : "node_124"
+          "true_next" : "node_130",
+          "false_next" : "node_134"
         },
         {
-          "name" : "node_120",
-          "id" : 46,
+          "name" : "node_130",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 296,
@@ -23654,11 +26393,11 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v4",
-          "false_next" : "node_122"
+          "false_next" : "node_132"
         },
         {
-          "name" : "node_122",
-          "id" : 47,
+          "name" : "node_132",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 301,
@@ -23677,11 +26416,11 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v6",
-          "false_next" : "node_124"
+          "false_next" : "node_134"
         },
         {
-          "name" : "node_124",
-          "id" : 48,
+          "name" : "node_134",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -23756,15 +26495,15 @@
               }
             }
           },
-          "false_next" : null,
-          "true_next" : "node_125"
+          "true_next" : "node_135",
+          "false_next" : "tbl_slicing126"
         },
         {
-          "name" : "node_125",
-          "id" : 49,
+          "name" : "node_135",
+          "id" : 53,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 117,
+            "line" : 127,
             "column" : 36,
             "source_fragment" : "fabric_metadata"
           },
@@ -23775,16 +26514,16 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._int_meta_source42"]
+                "value" : ["scalars", "userMetadata._int_meta_source56"]
               }
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_127"
+          "false_next" : "node_137"
         },
         {
-          "name" : "node_127",
-          "id" : 50,
+          "name" : "node_137",
+          "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -23802,12 +26541,12 @@
               }
             }
           },
-          "false_next" : null,
-          "true_next" : "tbl_act"
+          "true_next" : "tbl_act",
+          "false_next" : "tbl_slicing126"
         },
         {
-          "name" : "node_130",
-          "id" : 51,
+          "name" : "node_140",
+          "id" : 55,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -23826,18 +26565,18 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "userMetadata._int_meta_transit43"]
+                    "value" : ["scalars", "userMetadata._int_meta_transit57"]
                   }
                 }
               }
             }
           },
           "true_next" : "tbl_int_transit420",
-          "false_next" : "node_132"
+          "false_next" : "node_142"
         },
         {
-          "name" : "node_132",
-          "id" : 52,
+          "name" : "node_142",
+          "id" : 56,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -23857,11 +26596,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_142"
+          "false_next" : "node_152"
         },
         {
-          "name" : "node_136",
-          "id" : 53,
+          "name" : "node_146",
+          "id" : 57,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -23880,11 +26619,11 @@
             }
           },
           "true_next" : "tbl_int_transit428",
-          "false_next" : "node_138"
+          "false_next" : "node_148"
         },
         {
-          "name" : "node_138",
-          "id" : 54,
+          "name" : "node_148",
+          "id" : 58,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -23903,11 +26642,11 @@
             }
           },
           "true_next" : "tbl_int_transit431",
-          "false_next" : "node_140"
+          "false_next" : "node_150"
         },
         {
-          "name" : "node_140",
-          "id" : 55,
+          "name" : "node_150",
+          "id" : 59,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -23926,11 +26665,11 @@
             }
           },
           "true_next" : "tbl_int_transit434",
-          "false_next" : "node_142"
+          "false_next" : "node_152"
         },
         {
-          "name" : "node_142",
-          "id" : 56,
+          "name" : "node_152",
+          "id" : 60,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 115,
@@ -23952,14 +26691,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_144"
+          "false_next" : "node_154"
         },
         {
-          "name" : "node_144",
-          "id" : 57,
+          "name" : "node_154",
+          "id" : 61,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 117,
+            "line" : 127,
             "column" : 36,
             "source_fragment" : "fabric_metadata"
           },
@@ -23970,12 +26709,58 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "userMetadata._int_meta_sink44"]
+                "value" : ["scalars", "userMetadata._int_meta_sink58"]
+              }
+            }
+          },
+          "true_next" : "tbl_process_int_main_process_int_sink_restore_header",
+          "false_next" : "tbl_slicing126"
+        },
+        {
+          "name" : "node_159",
+          "id" : 62,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 154,
+            "column" : 16,
+            "source_fragment" : "hdr.gtpu_ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["gtpu_ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_slicing155",
+          "false_next" : "node_161"
+        },
+        {
+          "name" : "node_161",
+          "id" : 63,
+          "source_info" : {
+            "filename" : "include/control/slicing.p4",
+            "line" : 158,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
               }
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_process_int_main_process_int_sink_restore_header"
+          "true_next" : "tbl_slicing159"
         }
       ]
     }
@@ -24012,7 +26797,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
-        "line" : 358,
+        "line" : 393,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },