diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index b20a1ff..e77a652 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -4,32 +4,36 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["last_ipv4_dscp", 6, false],
-        ["tmp", 4, false],
-        ["tmp_0", 8, false],
+        ["last_ipv4_dscp_0", 6, false],
+        ["tmp_0", 4, false],
+        ["tmp", 8, false],
         ["tmp_1", 32, false],
         ["tmp_2", 32, false],
         ["tmp_3", 32, false],
-        ["spgw_ingress_tmp_1", 1, false],
-        ["spgw_ingress_tmp_2", 1, false],
-        ["filtering_tmp_0", 1, false],
-        ["next_tmp_2", 1, false],
-        ["next_tmp_3", 1, false],
-        ["next_tmp_4", 1, false],
-        ["spgw_normalizer_hasReturned_0", 1, false],
-        ["spgw_ingress_hasReturned_0", 1, false],
-        ["next_hasReturned_0", 1, false],
-        ["process_int_main_process_int_transit_hasReturned_0", 1, false],
+        ["spgw_ingress_tmp", 1, false],
+        ["spgw_ingress_tmp_0", 1, false],
+        ["spgw_normalizer_hasReturned", 1, false],
+        ["spgw_ingress_hasReturned", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["process_int_main_process_int_transit_hasReturned", 1, false],
+        ["fabric_metadata_t.eth_type", 16, false],
+        ["fabric_metadata_t.ip_eth_type", 16, false],
+        ["fabric_metadata_t.vlan_id", 12, false],
+        ["fabric_metadata_t.vlan_pri", 3, false],
+        ["fabric_metadata_t.vlan_cfi", 1, false],
+        ["fabric_metadata_t.mpls_label", 20, false],
+        ["fabric_metadata_t.mpls_ttl", 8, false],
+        ["fabric_metadata_t.skip_forwarding", 1, false],
+        ["fabric_metadata_t.skip_next", 1, false],
         ["fabric_metadata_t.fwd_type", 3, false],
         ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.pop_vlan_when_packet_in", 1, false],
         ["fabric_metadata_t.is_multicast", 1, false],
         ["fabric_metadata_t.is_controller_packet_out", 1, false],
         ["fabric_metadata_t.clone_to_cpu", 1, false],
         ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_src_port", 16, false],
-        ["fabric_metadata_t.l4_dst_port", 16, false],
-        ["_padding_2", 5, false]
+        ["fabric_metadata_t.l4_sport", 16, false],
+        ["fabric_metadata_t.l4_dport", 16, false],
+        ["_padding_2", 4, false]
       ]
     },
     {
@@ -66,7 +70,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -76,7 +80,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -112,8 +116,8 @@
       "name" : "udp_t",
       "id" : 6,
       "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["len", 16, false],
         ["checksum", 16, false]
       ]
@@ -148,22 +152,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 9,
       "fields" : [
-        ["hw_type", 16, false],
-        ["proto_type", 16, false],
-        ["hw_addr_len", 8, false],
-        ["proto_addr_len", 8, false],
-        ["opcode", 16, false]
-      ]
-    },
-    {
-      "name" : "tcp_t",
-      "id" : 10,
-      "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["seq_no", 32, false],
         ["ack_no", 32, false],
         ["data_offset", 4, false],
@@ -177,7 +170,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -189,7 +182,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -197,7 +190,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 13,
+      "id" : 12,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -205,7 +198,7 @@
     },
     {
       "name" : "report_fixed_header_t",
-      "id" : 14,
+      "id" : 13,
       "fields" : [
         ["ver", 4, false],
         ["nproto", 4, false],
@@ -220,7 +213,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 15,
+      "id" : 14,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -230,7 +223,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 16,
+      "id" : 15,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -249,14 +242,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 17,
+      "id" : 16,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 18,
+      "id" : 17,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -264,14 +257,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 19,
+      "id" : 18,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 20,
+      "id" : 19,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -279,21 +272,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 21,
+      "id" : 20,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 22,
+      "id" : 21,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 23,
+      "id" : 22,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -301,14 +294,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 24,
+      "id" : 23,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "int_data_t",
-      "id" : 25,
+      "id" : 24,
       "fields" : [
         ["data", "*"]
       ],
@@ -316,7 +309,7 @@
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 26,
+      "id" : 25,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -326,7 +319,7 @@
     },
     {
       "name" : "spgw_meta_t",
-      "id" : 27,
+      "id" : 26,
       "fields" : [
         ["direction", 2, false],
         ["ipv4_len", 16, false],
@@ -338,7 +331,7 @@
     },
     {
       "name" : "int_metadata_t",
-      "id" : 28,
+      "id" : 27,
       "fields" : [
         ["source", 1, 0],
         ["transit", 1, 0],
@@ -382,65 +375,65 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "inner_vlan_tag",
       "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 5,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 5,
+      "id" : 6,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_ipv4",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv6",
-      "id" : 11,
-      "header_type" : "ipv6_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 12,
-      "header_type" : "arp_t",
+      "header_type" : "ipv6_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -640,7 +633,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "hexstr",
@@ -705,6 +698,32 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -722,12 +741,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -747,7 +760,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -768,12 +781,58 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
+              "value" : "0x86dd",
+              "mask" : null,
+              "next_state" : "parse_ipv6"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -799,13 +858,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["inner_vlan_tag", "eth_type"]
             }
           ]
         },
         {
           "name" : "parse_mpls",
-          "id" : 4,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -820,7 +879,33 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -852,13 +937,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -886,7 +971,20 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -930,7 +1028,7 @@
         },
         {
           "name" : "parse_ipv6",
-          "id" : 6,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -953,6 +1051,19 @@
                 }
               ],
               "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x86dd"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -988,29 +1099,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 7,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 8,
           "parser_ops" : [
@@ -1027,11 +1115,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "src_port"]
+                  "value" : ["tcp", "sport"]
                 }
               ],
               "op" : "set"
@@ -1040,11 +1128,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "dst_port"]
+                  "value" : ["tcp", "dport"]
                 }
               ],
               "op" : "set"
@@ -1076,11 +1164,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "src_port"]
+                  "value" : ["udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -1089,11 +1177,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "dst_port"]
+                  "value" : ["udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -1115,7 +1203,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -1150,7 +1238,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp"]
                 },
                 {
                   "type" : "expression",
@@ -1209,7 +1297,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             }
           ]
         },
@@ -1239,7 +1327,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -1298,11 +1386,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "src_port"]
+                  "value" : ["inner_udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -1311,11 +1399,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "dst_port"]
+                  "value" : ["inner_udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -1350,7 +1438,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "last_ipv4_dscp"]
+              "value" : ["scalars", "last_ipv4_dscp_0"]
             }
           ]
         },
@@ -1526,11 +1614,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "report_ethernet", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "mpls", "arp", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
+      "order" : ["packet_in", "report_ethernet", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
     }
   ],
   "meter_arrays" : [],
@@ -1566,7 +1654,7 @@
       "binding" : "FabricIngress.process_set_source_sink.tb_set_sink",
       "source_info" : {
         "filename" : "include/int/int_main.p4",
-        "line" : 58,
+        "line" : 60,
         "column" : 50,
         "source_fragment" : "counter_set_sink"
       }
@@ -1578,7 +1666,7 @@
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 34,
+        "line" : 31,
         "column" : 50,
         "source_fragment" : "ingress_port_vlan_counter"
       }
@@ -1590,7 +1678,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -1602,7 +1690,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -1614,7 +1702,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1626,89 +1714,101 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 80,
+        "line" : 82,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
     },
     {
-      "name" : "FabricIngress.forwarding.acl_counter",
-      "id" : 8,
-      "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
-      "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
-        "column" : 50,
-        "source_fragment" : "acl_counter"
-      }
-    },
-    {
       "name" : "FabricIngress.forwarding.routing_v6_counter",
-      "id" : 9,
+      "id" : 8,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.routing_v6",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 171,
+        "line" : 110,
         "column" : 50,
         "source_fragment" : "routing_v6_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.acl.acl_counter",
+      "id" : 9,
+      "is_direct" : true,
+      "binding" : "FabricIngress.acl.acl",
+      "source_info" : {
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
+        "column" : 50,
+        "source_fragment" : "acl_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 10,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.vlan_meta",
+      "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 58,
+        "line" : 67,
         "column" : 50,
-        "source_fragment" : "vlan_meta_counter"
+        "source_fragment" : "next_vlan_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.xconnect_counter",
+      "id" : 11,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.xconnect",
+      "source_info" : {
+        "filename" : "include/control/next.p4",
+        "line" : 91,
+        "column" : 50,
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
       "name" : "FabricIngress.next.simple_counter",
-      "id" : 11,
+      "id" : 12,
       "is_direct" : true,
       "binding" : "FabricIngress.next.simple",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 123,
         "column" : 50,
         "source_fragment" : "simple_counter"
       }
     },
     {
       "name" : "FabricIngress.next.hashed_counter",
-      "id" : 12,
+      "id" : 13,
       "is_direct" : true,
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
     },
     {
       "name" : "FabricIngress.next.multicast_counter",
-      "id" : 13,
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
     },
     {
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
-      "id" : 14,
+      "id" : 15,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -1717,10 +1817,10 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 15,
+      "id" : 16,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -1729,7 +1829,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 16,
+      "id" : 17,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -1741,12 +1841,12 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 17,
+      "id" : 18,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -1820,7 +1920,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1941,67 +2041,67 @@
   "learn_lists" : [],
   "actions" : [
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 0,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 1,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 2,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 3,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 4,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 5,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 6,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 7,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 8,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 9,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 10,
       "runtime_data" : [],
       "primitives" : []
@@ -2013,31 +2113,10 @@
       "primitives" : []
     },
     {
-      "name" : "drop_now",
+      "name" : "nop",
       "id" : 12,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
       "name" : "FabricIngress.spgw_ingress.gtpu_decap",
@@ -2054,7 +2133,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 54,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
           }
@@ -2069,7 +2148,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
           }
@@ -2084,7 +2163,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
           }
@@ -2123,9 +2202,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 62,
+            "line" : 63,
             "column" : 8,
-            "source_fragment" : "spgw_meta.teid = teid"
+            "source_fragment" : "fabric_meta.spgw.teid = teid"
           }
         },
         {
@@ -2142,9 +2221,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 63,
+            "line" : 64,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
           }
         },
         {
@@ -2161,9 +2240,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 64,
+            "line" : 65,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
           }
         }
       ]
@@ -2233,7 +2312,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 61,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "fabric_metadata.int_meta.sink = true"
           }
@@ -2241,179 +2320,16 @@
       ]
     },
     {
-      "name" : "FabricIngress.filtering.drop",
+      "name" : "FabricIngress.filtering.deny",
       "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 18,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 19,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "cfi"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "pri"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 52,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 99,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
+              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -2432,22 +2348,82 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
+            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 20,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 19,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 21,
+      "id" : 20,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2469,7 +2445,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -2478,7 +2454,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 22,
+      "id" : 21,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2500,16 +2476,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 37,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 23,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2518,18 +2494,22 @@
       ],
       "primitives" : [
         {
-          "op" : "remove_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "mpls"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
             }
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 60,
+            "line" : 62,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
           }
         },
         {
@@ -2546,16 +2526,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 61,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 24,
+      "id" : 23,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2577,21 +2557,52 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 25,
+      "id" : 24,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
+      "id" : 25,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.set_next_id_acl",
       "id" : 26,
       "runtime_data" : [
         {
@@ -2613,8 +2624,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 110,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -2622,7 +2633,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
+      "name" : "FabricIngress.acl.punt_to_cpu",
       "id" : 27,
       "runtime_data" : [],
       "primitives" : [
@@ -2639,26 +2650,45 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 116,
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
         },
         {
-          "op" : "exit",
-          "parameters" : [],
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 118,
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
             "column" : 8,
-            "source_fragment" : "exit"
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.clone_to_cpu",
+      "name" : "FabricIngress.acl.clone_to_cpu",
       "id" : 28,
       "runtime_data" : [],
       "primitives" : [
@@ -2685,8 +2715,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 123,
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "fabric_metadata.clone_to_cpu = true"
           }
@@ -2694,7 +2724,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
+      "name" : "FabricIngress.acl.drop",
       "id" : 29,
       "runtime_data" : [],
       "primitives" : [
@@ -2702,25 +2732,116 @@
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 128,
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
+          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_acl",
+      "name" : "FabricIngress.acl.nop_acl",
       "id" : 30,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
+      "name" : "FabricIngress.next.set_vlan",
       "id" : 31,
       "runtime_data" : [
         {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 70,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_xconnect",
+      "id" : 32,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 33,
+      "runtime_data" : [
+        {
           "name" : "next_id",
           "bitwidth" : 32
         }
@@ -2739,8 +2860,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 174,
+            "filename" : "include/control/next.p4",
+            "line" : 99,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -2748,76 +2869,10 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.set_vlan",
-      "id" : 32,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 61,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricIngress.next.output_simple",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_vlan_output",
       "id" : 34,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
           "name" : "port_num",
           "bitwidth" : 9
         }
@@ -2828,7 +2883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["standard_metadata", "egress_spec"]
             },
             {
               "type" : "runtime_data",
@@ -2837,34 +2892,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_simple",
+      "name" : "FabricIngress.next.routing_simple",
       "id" : 35,
       "runtime_data" : [
         {
@@ -2895,7 +2931,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2933,15 +2969,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_simple",
+      "name" : "FabricIngress.next.mpls_routing_simple",
       "id" : 36,
       "runtime_data" : [
         {
@@ -2967,6 +3003,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -2976,7 +3031,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -3014,142 +3069,20 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v6_simple",
+      "name" : "FabricIngress.next.output_hashed",
       "id" : 37,
       "runtime_data" : [
         {
           "name" : "port_num",
           "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -3158,44 +3091,6 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["standard_metadata", "egress_spec"]
             },
             {
@@ -3205,125 +3100,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_vlan",
+      "name" : "FabricIngress.next.routing_hashed",
       "id" : 38,
       "runtime_data" : [
         {
@@ -3337,10 +3122,6 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
         }
       ],
       "primitives" : [
@@ -3358,7 +3139,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -3387,25 +3168,6 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["standard_metadata", "egress_spec"]
             },
             {
@@ -3415,15 +3177,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_hashed",
+      "name" : "FabricIngress.next.mpls_routing_hashed",
       "id" : 39,
       "runtime_data" : [
         {
@@ -3437,6 +3199,10 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -3445,6 +3211,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -3454,7 +3239,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -3492,401 +3277,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
+      "name" : "FabricIngress.next.set_mcast_group_id",
       "id" : 40,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 41,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 42,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -3905,9 +3308,9 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "standard_metadata.mcast_grp = gid"
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
         },
         {
@@ -3934,7 +3337,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -3943,7 +3346,7 @@
     },
     {
       "name" : "act",
-      "id" : 43,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3951,7 +3354,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3979,7 +3382,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 44,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3992,7 +3395,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -4007,7 +3410,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -4017,7 +3420,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4039,7 +3442,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 45,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4065,7 +3468,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 46,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4087,7 +3490,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 47,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4151,7 +3554,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 48,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4168,7 +3571,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 26,
+            "line" : 25,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
           }
@@ -4183,7 +3586,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -4212,7 +3615,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -4221,6 +3624,115 @@
     },
     {
       "name" : "act_5",
+      "id" : 47,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 103,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_6",
+      "id" : 48,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x41"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 113,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
       "id" : 49,
       "runtime_data" : [],
       "primitives" : [
@@ -4229,7 +3741,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -4250,7 +3762,7 @@
       ]
     },
     {
-      "name" : "act_6",
+      "name" : "act_8",
       "id" : 50,
       "runtime_data" : [],
       "primitives" : [
@@ -4259,7 +3771,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -4280,11 +3792,28 @@
       ]
     },
     {
-      "name" : "act_7",
+      "name" : "act_9",
       "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 148,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 52,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "assign",
           "parameters" : [
             {
@@ -4298,7 +3827,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 137,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -4306,37 +3835,7 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 52,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
+      "name" : "act_11",
       "id" : 53,
       "runtime_data" : [],
       "primitives" : [
@@ -4345,82 +3844,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 54,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x02"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 130,
-            "column" : 38,
-            "source_fragment" : "2w2; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 55,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 37,
-            "source_fragment" : "2w0; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4436,19 +3860,13 @@
                 }
               }
             }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 153,
-            "column" : 12,
-            "source_fragment" : "return"
-          }
+          ]
         }
       ]
     },
     {
       "name" : "act_12",
-      "id" : 56,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4456,7 +3874,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4478,7 +3896,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 57,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4486,25 +3904,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["userMetadata.spgw", "direction"]
             },
             {
-              "type" : "field",
-              "value" : ["ipv4", "total_len"]
+              "type" : "hexstr",
+              "value" : "0x02"
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 170,
-            "column" : 8,
-            "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
+            "filename" : "include/control/../define.p4",
+            "line" : 138,
+            "column" : 38,
+            "source_fragment" : "2w2; ..."
           }
         }
       ]
     },
     {
       "name" : "act_14",
-      "id" : 58,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4512,7 +3930,26 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["userMetadata.spgw", "direction"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 136,
+            "column" : 37,
+            "source_fragment" : "2w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4528,13 +3965,19 @@
                 }
               }
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 157,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
         }
       ]
     },
     {
       "name" : "act_15",
-      "id" : 59,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4542,7 +3985,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4564,7 +4007,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 60,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4572,395 +4015,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["userMetadata.spgw", "ipv4_len"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x07"
+              "type" : "field",
+              "value" : ["ipv4", "total_len"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 119,
-            "column" : 31,
-            "source_fragment" : "7; ..."
+            "filename" : "include/spgw.p4",
+            "line" : 174,
+            "column" : 8,
+            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
           }
         }
       ]
     },
     {
       "name" : "act_17",
-      "id" : 61,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 102,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_18",
-      "id" : 62,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 64,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_21",
-      "id" : 65,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_22",
-      "id" : 66,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_23",
-      "id" : 67,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_24",
-      "id" : 68,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_25",
-      "id" : 69,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 223,
-            "column" : 20,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_26",
-      "id" : 70,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv4", "ttl"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv4", "ttl"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 230,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_27",
-      "id" : 71,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv6", "hop_limit"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv6", "hop_limit"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 234,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_28",
-      "id" : 72,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4990,7 +4063,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
           }
@@ -5009,7 +4082,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
           }
@@ -5017,8 +4090,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 73,
+      "name" : "act_18",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5048,7 +4121,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
           }
@@ -5067,7 +4140,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
           }
@@ -5075,8 +4148,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 74,
+      "name" : "act_19",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5093,7 +4166,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 85,
+            "line" : 89,
             "column" : 12,
             "source_fragment" : "clone(CloneType.I2E, REPORT_MIRROR_SESSION_ID)"
           }
@@ -5101,98 +4174,44 @@
       ]
     },
     {
-      "name" : "NoAction",
-      "id" : 75,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 76,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 77,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 78,
+      "name" : "nop",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 79,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 80,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 81,
+      "name" : "nop",
+      "id" : 65,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 82,
+      "name" : "NoAction",
+      "id" : 66,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 67,
+      "runtime_data" : [],
+      "primitives" : []
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 83,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5205,7 +4224,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 185,
+            "line" : 190,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
           }
@@ -5224,7 +4243,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 186,
+            "line" : 191,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
           }
@@ -5243,7 +4262,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 111,
+            "line" : 119,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -5262,7 +4281,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 188,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dscp = 0"
           }
@@ -5281,7 +4300,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 189,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.ecn = 0"
           }
@@ -5323,7 +4342,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 190,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
           }
@@ -5342,7 +4361,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 192,
+            "line" : 197,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
           }
@@ -5361,7 +4380,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 193,
+            "line" : 198,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
           }
@@ -5380,7 +4399,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 194,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
           }
@@ -5399,7 +4418,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -5418,7 +4437,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -5437,9 +4456,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 197,
+            "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
           }
         },
         {
@@ -5456,9 +4475,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 198,
+            "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
           }
         },
         {
@@ -5475,7 +4494,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 199,
+            "line" : 204,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
           }
@@ -5490,7 +4509,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 201,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
           }
@@ -5500,7 +4519,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "src_port"]
+              "value" : ["gtpu_udp", "sport"]
             },
             {
               "type" : "hexstr",
@@ -5509,9 +4528,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 202,
+            "line" : 207,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.src_port = 2152"
+            "source_fragment" : "gtpu_udp.sport = 2152"
           }
         },
         {
@@ -5519,7 +4538,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "dst_port"]
+              "value" : ["gtpu_udp", "dport"]
             },
             {
               "type" : "hexstr",
@@ -5528,9 +4547,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 203,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.dst_port = 2152"
+            "source_fragment" : "gtpu_udp.dport = 2152"
           }
         },
         {
@@ -5570,9 +4589,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 204,
+            "line" : 209,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
+            "source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
           }
         },
         {
@@ -5589,7 +4608,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 206,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
           }
@@ -5604,7 +4623,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 208,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
           }
@@ -5623,7 +4642,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 209,
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
           }
@@ -5642,7 +4661,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 210,
+            "line" : 215,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
           }
@@ -5661,7 +4680,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 211,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
           }
@@ -5680,7 +4699,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 212,
+            "line" : 217,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
           }
@@ -5699,7 +4718,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 213,
+            "line" : 218,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
           }
@@ -5718,7 +4737,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 214,
+            "line" : 219,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
           }
@@ -5737,7 +4756,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 215,
+            "line" : 220,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
           }
@@ -5756,9 +4775,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 216,
+            "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
           }
         },
         {
@@ -5775,16 +4794,16 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 217,
+            "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = spgw_meta.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
           }
         }
       ]
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 84,
+      "id" : 69,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -5814,7 +4833,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setValid()"
           }
@@ -5833,7 +4852,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 33,
+            "line" : 34,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.int_type = 1"
           }
@@ -5852,7 +4871,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 139,
+            "line" : 147,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -5867,7 +4886,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setValid()"
           }
@@ -5886,7 +4905,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ver = 0"
           }
@@ -5905,7 +4924,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 38,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rep = 0"
           }
@@ -5924,7 +4943,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 39,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.int_header.c = 0"
           }
@@ -5943,7 +4962,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_header.e = 0"
           }
@@ -5962,7 +4981,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rsvd1 = 0"
           }
@@ -5981,7 +5000,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 42,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ins_cnt = ins_cnt; ..."
           }
@@ -6000,7 +5019,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 43,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.int_header.max_hop_cnt = max_hop; ..."
           }
@@ -6019,7 +5038,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 44,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = 0"
           }
@@ -6038,7 +5057,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 45,
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0003 = ins_mask0003; ..."
           }
@@ -6057,7 +5076,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 46,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0407 = ins_mask0407; ..."
           }
@@ -6076,7 +5095,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 47,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0811 = 0"
           }
@@ -6095,7 +5114,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 48,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_1215 = 0"
           }
@@ -6110,7 +5129,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setValid()"
           }
@@ -6129,7 +5148,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 51,
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.next_proto = hdr.ipv4.protocol"
           }
@@ -6143,14 +5162,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 52,
+            "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dst_port"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
           }
         },
         {
@@ -6167,7 +5186,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 53,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.dscp = hdr.ipv4.dscp"
           }
@@ -6209,7 +5228,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + INT_HEADER_LEN_BYTES"
           }
@@ -6251,7 +5270,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + INT_HEADER_LEN_BYTES"
           }
@@ -6270,7 +5289,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 143,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -6279,7 +5298,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 85,
+      "id" : 70,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -6339,13 +5358,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 86,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 87,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6358,7 +5377,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6377,7 +5396,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6409,7 +5428,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6451,7 +5470,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6493,7 +5512,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6502,7 +5521,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 88,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6515,7 +5534,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6534,7 +5553,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6576,7 +5595,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6618,7 +5637,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6627,7 +5646,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 89,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6640,7 +5659,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6659,7 +5678,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6691,7 +5710,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6706,7 +5725,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6725,7 +5744,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6767,7 +5786,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6809,7 +5828,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6818,7 +5837,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 90,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6831,7 +5850,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6863,7 +5882,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6895,7 +5914,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6937,7 +5956,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6979,7 +5998,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6988,7 +6007,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 91,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7001,7 +6020,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7020,7 +6039,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7052,7 +6071,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7067,7 +6086,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7099,7 +6118,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7131,7 +6150,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7173,7 +6192,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7215,7 +6234,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7224,7 +6243,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 92,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7237,7 +6256,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7256,7 +6275,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7271,7 +6290,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7303,7 +6322,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7335,7 +6354,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7377,7 +6396,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7419,7 +6438,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7428,7 +6447,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 93,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7441,7 +6460,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7460,7 +6479,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7492,7 +6511,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7507,7 +6526,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7526,7 +6545,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7541,7 +6560,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7573,7 +6592,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7605,7 +6624,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7647,7 +6666,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -7689,7 +6708,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -7698,7 +6717,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 94,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7711,7 +6730,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7730,7 +6749,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7772,7 +6791,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7814,7 +6833,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7823,7 +6842,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 95,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7836,7 +6855,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7855,7 +6874,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7887,7 +6906,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7902,7 +6921,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7921,7 +6940,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7963,7 +6982,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8005,7 +7024,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8014,7 +7033,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 96,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8027,7 +7046,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8046,7 +7065,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8061,7 +7080,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8080,7 +7099,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8122,7 +7141,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8164,7 +7183,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8173,7 +7192,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 97,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8186,7 +7205,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8205,7 +7224,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8237,7 +7256,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -8252,7 +7271,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8271,7 +7290,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8286,7 +7305,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8305,7 +7324,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8347,7 +7366,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8389,7 +7408,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8398,7 +7417,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 98,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8411,7 +7430,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8443,7 +7462,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8475,7 +7494,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8490,7 +7509,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8509,7 +7528,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8551,7 +7570,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8593,7 +7612,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8602,7 +7621,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 99,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8615,7 +7634,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8634,7 +7653,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8666,7 +7685,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -8681,7 +7700,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8713,7 +7732,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8745,7 +7764,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8760,7 +7779,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8779,7 +7798,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8821,7 +7840,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8863,7 +7882,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8872,7 +7891,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 100,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8885,7 +7904,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8904,7 +7923,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8919,7 +7938,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8951,7 +7970,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8983,7 +8002,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8998,7 +8017,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -9017,7 +8036,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -9059,7 +8078,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9101,7 +8120,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9110,7 +8129,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 101,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9123,7 +8142,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -9142,7 +8161,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -9174,7 +8193,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -9189,7 +8208,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -9208,7 +8227,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -9223,7 +8242,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -9255,7 +8274,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -9287,7 +8306,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -9302,7 +8321,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -9321,7 +8340,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -9363,7 +8382,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -9405,7 +8424,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -9414,13 +8433,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 102,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 103,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9433,7 +8452,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9452,7 +8471,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9494,7 +8513,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -9536,7 +8555,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -9545,7 +8564,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 104,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9558,7 +8577,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9577,7 +8596,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9596,7 +8615,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9638,7 +8657,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -9680,7 +8699,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -9689,7 +8708,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 105,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9702,7 +8721,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9721,7 +8740,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9736,7 +8755,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9755,7 +8774,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9774,7 +8793,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9816,7 +8835,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9858,7 +8877,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9867,7 +8886,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 106,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9880,7 +8899,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9922,7 +8941,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9964,7 +8983,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -10006,7 +9025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -10015,7 +9034,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 107,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10028,7 +9047,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10047,7 +9066,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10062,7 +9081,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10104,7 +9123,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10146,7 +9165,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10188,7 +9207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10197,7 +9216,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 108,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10210,7 +9229,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10229,7 +9248,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10248,7 +9267,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10263,7 +9282,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10305,7 +9324,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10347,7 +9366,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10389,7 +9408,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10398,7 +9417,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 109,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10411,7 +9430,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10430,7 +9449,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10445,7 +9464,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10464,7 +9483,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10483,7 +9502,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10498,7 +9517,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10540,7 +9559,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10582,7 +9601,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -10624,7 +9643,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -10633,7 +9652,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 110,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10646,7 +9665,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10665,7 +9684,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10707,7 +9726,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -10749,7 +9768,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -10758,7 +9777,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 111,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10771,7 +9790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10790,7 +9809,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10805,7 +9824,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10824,7 +9843,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10866,7 +9885,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10908,7 +9927,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10917,7 +9936,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 112,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10930,7 +9949,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10949,7 +9968,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10968,7 +9987,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10983,7 +10002,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11002,7 +10021,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11044,7 +10063,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -11086,7 +10105,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -11095,7 +10114,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 113,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11108,7 +10127,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11127,7 +10146,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11142,7 +10161,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11161,7 +10180,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11180,7 +10199,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11195,7 +10214,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11214,7 +10233,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11256,7 +10275,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11298,7 +10317,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11307,7 +10326,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 114,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11320,7 +10339,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11362,7 +10381,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11377,7 +10396,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11396,7 +10415,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11438,7 +10457,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -11480,7 +10499,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -11489,7 +10508,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 115,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11502,7 +10521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11521,7 +10540,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11536,7 +10555,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11578,7 +10597,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11593,7 +10612,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11612,7 +10631,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11654,7 +10673,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11696,7 +10715,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11705,7 +10724,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 116,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11718,7 +10737,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11737,7 +10756,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11756,7 +10775,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11771,7 +10790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11813,7 +10832,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11828,7 +10847,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11847,7 +10866,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11889,7 +10908,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11931,7 +10950,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11940,7 +10959,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 117,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11953,7 +10972,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11972,7 +10991,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11987,7 +11006,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -12006,7 +11025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -12025,7 +11044,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -12040,7 +11059,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -12082,7 +11101,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -12097,7 +11116,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -12116,7 +11135,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -12158,7 +11177,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -12200,7 +11219,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -12209,7 +11228,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 118,
+      "id" : 103,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -12243,7 +11262,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 49,
+            "line" : 50,
             "column" : 8,
             "source_fragment" : "hdr.report_ethernet.setValid()"
           }
@@ -12262,7 +11281,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.report_ethernet.dst_addr = mon_mac"
           }
@@ -12281,7 +11300,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 51,
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.report_ethernet.src_addr = src_mac"
           }
@@ -12291,7 +11310,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["report_ethernet", "ether_type"]
+              "value" : ["report_ethernet", "eth_type"]
             },
             {
               "type" : "hexstr",
@@ -12300,7 +11319,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 102,
+            "line" : 110,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -12315,7 +11334,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.setValid()"
           }
@@ -12334,7 +11353,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.version = 4w4"
           }
@@ -12353,7 +11372,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 57,
+            "line" : 58,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.ihl = 4w5"
           }
@@ -12372,7 +11391,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 58,
+            "line" : 59,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.dscp = 6w0"
           }
@@ -12391,7 +11410,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 59,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.ecn = 2w0"
           }
@@ -12433,7 +11452,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 61,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.total_len = (bit<16>) IPV4_MIN_HEAD_LEN + (bit<16>) UDP_HEADER_LEN + ..."
           }
@@ -12452,7 +11471,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 64,
+            "line" : 65,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.identification = 0"
           }
@@ -12471,7 +11490,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 65,
+            "line" : 66,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.flags = 0"
           }
@@ -12490,7 +11509,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 66,
+            "line" : 67,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.frag_offset = 0"
           }
@@ -12509,7 +11528,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 67,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.ttl = 0xFF"
           }
@@ -12528,7 +11547,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -12547,7 +11566,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 69,
+            "line" : 70,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.src_addr = src_ip"
           }
@@ -12566,7 +11585,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 70,
+            "line" : 71,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.dst_addr = mon_ip"
           }
@@ -12581,7 +11600,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 73,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.report_udp.setValid()"
           }
@@ -12591,7 +11610,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["report_udp", "src_port"]
+              "value" : ["report_udp", "sport"]
             },
             {
               "type" : "hexstr",
@@ -12600,9 +11619,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 74,
+            "line" : 75,
             "column" : 8,
-            "source_fragment" : "hdr.report_udp.src_port = 0"
+            "source_fragment" : "hdr.report_udp.sport = 0"
           }
         },
         {
@@ -12610,7 +11629,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["report_udp", "dst_port"]
+              "value" : ["report_udp", "dport"]
             },
             {
               "type" : "runtime_data",
@@ -12619,9 +11638,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 75,
+            "line" : 76,
             "column" : 8,
-            "source_fragment" : "hdr.report_udp.dst_port = mon_port"
+            "source_fragment" : "hdr.report_udp.dport = mon_port"
           }
         },
         {
@@ -12661,7 +11680,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 76,
+            "line" : 77,
             "column" : 8,
             "source_fragment" : "hdr.report_udp.len = (bit<16>) UDP_HEADER_LEN + (bit<16>) REPORT_FIXED_HEADER_LEN + ..."
           }
@@ -12676,7 +11695,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 30,
+            "line" : 31,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.setValid()"
           }
@@ -12695,7 +11714,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.ver = 0"
           }
@@ -12714,7 +11733,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 145,
+            "line" : 153,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -12733,7 +11752,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 34,
+            "line" : 35,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.d = 0"
           }
@@ -12752,7 +11771,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 35,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.q = 0"
           }
@@ -12771,7 +11790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.f = 1"
           }
@@ -12790,7 +11809,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.rsvd = 0"
           }
@@ -12809,7 +11828,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 149,
+            "line" : 157,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -12828,7 +11847,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.seq_no = 0"
           }
@@ -12847,7 +11866,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 43,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.ingress_tstamp = (bit<32>) standard_metadata.enq_timestamp"
           }
@@ -12856,7 +11875,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 119,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12864,7 +11883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             },
             {
               "type" : "field",
@@ -12873,9 +11892,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 26,
+            "line" : 27,
             "column" : 8,
-            "source_fragment" : "hdr.udp.dst_port = hdr.intl4_tail.dest_port"
+            "source_fragment" : "hdr.udp.dport = hdr.intl4_tail.dest_port"
           }
         },
         {
@@ -12892,7 +11911,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 27,
+            "line" : 28,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.dscp = hdr.intl4_tail.dscp"
           }
@@ -12901,7 +11920,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 120,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12971,7 +11990,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 33,
+            "line" : 35,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len - len_bytes"
           }
@@ -13043,7 +12062,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 34,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.udp.len = hdr.udp.len - len_bytes"
           }
@@ -13058,7 +12077,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 36,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setInvalid()"
           }
@@ -13073,7 +12092,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 37,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_data.setInvalid()"
           }
@@ -13088,7 +12107,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 38,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setInvalid()"
           }
@@ -13103,7 +12122,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 39,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setInvalid()"
           }
@@ -13118,7 +12137,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 40,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setInvalid()"
           }
@@ -13133,7 +12152,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setInvalid()"
           }
@@ -13148,7 +12167,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 42,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setInvalid()"
           }
@@ -13163,7 +12182,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 43,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setInvalid()"
           }
@@ -13178,7 +12197,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 44,
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setInvalid()"
           }
@@ -13193,7 +12212,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setInvalid()"
           }
@@ -13208,7 +12227,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setInvalid()"
           }
@@ -13223,7 +12242,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setInvalid()"
           }
@@ -13231,68 +12250,302 @@
       ]
     },
     {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 121,
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 40,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
           "op" : "remove_header",
           "parameters" : [
             {
               "type" : "header",
-              "value" : "vlan_tag"
+              "value" : "mpls"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 41,
+            "filename" : "include/control/next.p4",
+            "line" : 246,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+            "source_fragment" : "hdr.mpls.setInvalid()"
           }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 122,
-      "runtime_data" : [],
-      "primitives" : [
+        },
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 248,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 107,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 253,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 255,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 256,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 257,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 108,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 266,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 267,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 269,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 109,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 280,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
           }
         },
         {
@@ -13305,7 +12558,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -13313,8 +12566,25 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 123,
+      "name" : "act_20",
+      "id" : 110,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_21",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13327,7 +12597,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 57,
+            "line" : 49,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -13346,7 +12616,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 58,
+            "line" : 50,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -13354,8 +12624,25 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 124,
+      "name" : "act_22",
+      "id" : 112,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_23",
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13363,7 +12650,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_24",
+      "id" : 114,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -13384,8 +12701,25 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 125,
+      "name" : "act_25",
+      "id" : 115,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_26",
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13393,7 +12727,218 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_27",
+      "id" : 117,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_28",
+      "id" : 118,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 323,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_29",
+      "id" : 119,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 329,
+            "column" : 45,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_30",
+      "id" : 120,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv6", "hop_limit"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv6", "hop_limit"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 328,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_31",
+      "id" : 121,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_32",
+      "id" : 122,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -13412,7 +12957,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 376,
+            "line" : 420,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -13420,8 +12965,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 126,
+      "name" : "act_33",
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13461,7 +13006,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 384,
+            "line" : 428,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
           }
@@ -13469,8 +13014,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 127,
+      "name" : "act_34",
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13510,7 +13055,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 381,
+            "line" : 425,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
           }
@@ -13518,8 +13063,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 128,
+      "name" : "act_35",
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13559,7 +13104,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 387,
+            "line" : 431,
             "column" : 12,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
           }
@@ -13567,8 +13112,8 @@
       ]
     },
     {
-      "name" : "act_37",
-      "id" : 129,
+      "name" : "act_36",
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13608,7 +13153,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 390,
+            "line" : 434,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
           }
@@ -13622,7 +13167,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -13638,14 +13183,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
+          "action_ids" : [42],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13661,14 +13206,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [41],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13684,14 +13229,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [45],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13707,14 +13252,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
+          "action_ids" : [43],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13730,14 +13275,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
+          "action_ids" : [44],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13753,14 +13298,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [46],
           "actions" : ["act_4"],
           "base_default_next" : null,
           "next_tables" : {
             "act_4" : null
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13776,14 +13321,158 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_13",
+          "action_ids" : [47],
+          "actions" : ["act_5"],
+          "base_default_next" : "node_14",
           "next_tables" : {
-            "act_12" : "node_13"
+            "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 47,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_6",
+          "id" : 7,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [48],
+          "actions" : ["act_6"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 48,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 51,
+            "column" : 10,
+            "source_fragment" : "ingress_port_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "vlan_is_valid",
+              "target" : ["vlan_tag", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [17, 18, 19],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+          "next_tables" : {
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
+          },
+          "default_entry" : {
+            "action_id" : 17,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.fwd_classifier",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 86,
+            "column" : 10,
+            "source_fragment" : "fwd_classifier"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_dst",
+              "target" : ["ethernet", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [20],
+          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
+          "base_default_next" : "tbl_act_7",
+          "next_tables" : {
+            "FabricIngress.filtering.set_forwarding_type" : "tbl_act_7"
+          },
+          "default_entry" : {
+            "action_id" : 20,
+            "action_const" : true,
+            "action_data" : ["0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 10,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [57],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "act_15" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13791,17 +13480,17 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
-          "id" : 7,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 79,
+            "line" : 82,
             "column" : 10,
             "source_fragment" : "s1u_filter_table"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "gtpu_ipv4.dst_addr",
+              "name" : "gtp_ipv4_dst",
               "target" : ["gtpu_ipv4", "dst_addr"],
               "mask" : null
             }
@@ -13813,22 +13502,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [1],
-          "actions" : ["NoAction"],
+          "actions" : ["nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_6",
-            "__MISS__" : "tbl_act_7"
+            "__HIT__" : "tbl_act_8",
+            "__MISS__" : "tbl_act_9"
           },
           "default_entry" : {
             "action_id" : 1,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 8,
+          "name" : "tbl_act_8",
+          "id" : 12,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13837,10 +13526,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [49],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_17",
+          "actions" : ["act_7"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_5" : "node_17"
+            "act_7" : "node_23"
           },
           "default_entry" : {
             "action_id" : 49,
@@ -13850,8 +13539,8 @@
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 9,
+          "name" : "tbl_act_9",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13860,10 +13549,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [50],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_17",
+          "actions" : ["act_8"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_17"
+            "act_8" : "node_23"
           },
           "default_entry" : {
             "action_id" : 50,
@@ -13873,31 +13562,8 @@
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 10,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [12],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_8",
-          "next_tables" : {
-            "drop_now" : "tbl_act_8"
-          },
-          "default_entry" : {
-            "action_id" : 12,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 11,
+          "name" : "tbl_act_10",
+          "id" : 14,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13906,10 +13572,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [51],
-          "actions" : ["act_7"],
-          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
+          "actions" : ["act_9"],
+          "base_default_next" : "tbl_act_11",
           "next_tables" : {
-            "act_7" : "tbl_spgw_ingress_gtpu_decap"
+            "act_9" : "tbl_act_11"
           },
           "default_entry" : {
             "action_id" : 51,
@@ -13919,8 +13585,31 @@
           }
         },
         {
+          "name" : "tbl_act_11",
+          "id" : 15,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [52],
+          "actions" : ["act_10"],
+          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
+          "next_tables" : {
+            "act_10" : "tbl_spgw_ingress_gtpu_decap"
+          },
+          "default_entry" : {
+            "action_id" : 52,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_spgw_ingress_gtpu_decap",
-          "id" : 12,
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13930,9 +13619,9 @@
           "direct_meters" : null,
           "action_ids" : [13],
           "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
-          "base_default_next" : "node_27",
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
+            "FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
           },
           "default_entry" : {
             "action_id" : 13,
@@ -13943,17 +13632,17 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
-          "id" : 13,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 68,
+            "line" : 69,
             "column" : 10,
             "source_fragment" : "dl_sess_lookup"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -13965,45 +13654,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [14, 0],
-          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
+          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
+            "__HIT__" : "tbl_act_12",
+            "__MISS__" : "tbl_act_13"
           },
           "default_entry" : {
             "action_id" : 0,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 14,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_8" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 15,
+          "name" : "tbl_act_12",
+          "id" : 18,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14012,10 +13678,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [53],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_24",
+          "actions" : ["act_11"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "act_9" : "node_24"
+            "act_11" : "node_30"
           },
           "default_entry" : {
             "action_id" : 53,
@@ -14025,8 +13691,8 @@
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 16,
+          "name" : "tbl_act_13",
+          "id" : 19,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14035,10 +13701,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [54],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_27",
+          "actions" : ["act_12"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "act_10" : "node_27"
+            "act_12" : "node_30"
           },
           "default_entry" : {
             "action_id" : 54,
@@ -14048,101 +13714,6 @@
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_11" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 55,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
-          "id" : 18,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [57],
-          "actions" : ["act_13"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
-          "next_tables" : {
-            "act_13" : "FabricIngress.filtering.ingress_port_vlan"
-          },
-          "default_entry" : {
-            "action_id" : 57,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 66,
-            "column" : 10,
-            "source_fragment" : "ingress_port_vlan"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.is_valid",
-              "target" : ["vlan_tag", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [19, 18, 17, 20],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_14",
-            "__MISS__" : "tbl_act_15"
-          },
-          "default_entry" : {
-            "action_id" : 19,
-            "action_const" : true,
-            "action_data" : ["0xffe"],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_14",
           "id" : 20,
           "key" : [],
@@ -14152,14 +13723,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_32",
+          "action_ids" : [55],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_14" : "node_32"
+            "act_13" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14175,70 +13746,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_32",
+          "action_ids" : [56],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_15" : "node_32"
+            "act_14" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 22,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 103,
-            "column" : 10,
-            "source_fragment" : "fwd_classifier"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
-              "target" : ["ethernet", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [21],
-          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 21,
-            "action_const" : true,
-            "action_data" : ["0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_16",
-          "id" : 23,
+          "id" : 22,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14246,14 +13769,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
+          "action_ids" : [58],
           "actions" : ["act_16"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "act_16" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14261,23 +13784,23 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 24,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 10,
             "source_fragment" : "bridging"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -14288,34 +13811,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 4],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [21, 4],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 4,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 25,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "mpls"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.mpls.label",
-              "target" : ["mpls", "label"],
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
               "mask" : null
             }
           ],
@@ -14325,38 +13848,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 5],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_17",
+          "action_ids" : [22, 5],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_17",
-            "NoAction" : "tbl_act_17"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 5,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_17",
-          "id" : 26,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_17"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_17" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14364,17 +13864,17 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 27,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 91,
+            "line" : 93,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -14385,34 +13885,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [24, 25, 6],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [23, 24, 6],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
-            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 6,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.routing_v6",
-          "id" : 28,
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 178,
+            "line" : 117,
             "column" : 10,
             "source_fragment" : "routing_v6"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv6.dst_addr",
+              "name" : "ipv6_dst",
               "target" : ["ipv6", "dst_addr"],
               "mask" : null
             }
@@ -14423,99 +13923,99 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31, 7],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [25, 7],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v6" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v6" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 7,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 29,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 27,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 136,
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
             "column" : 10,
             "source_fragment" : "acl"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.ip_proto",
+              "name" : "ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_src",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.src_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_type",
+              "name" : "icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_code",
+              "name" : "icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -14527,14 +14027,14 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [26, 27, 28, 29, 30],
-          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_18",
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_45",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_18",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.drop" : "tbl_act_18",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_18"
+            "FabricIngress.acl.set_next_id_acl" : "node_45",
+            "FabricIngress.acl.punt_to_cpu" : "node_45",
+            "FabricIngress.acl.clone_to_cpu" : "node_45",
+            "FabricIngress.acl.drop" : "node_45",
+            "FabricIngress.acl.nop_acl" : "node_45"
           },
           "default_entry" : {
             "action_id" : 30,
@@ -14544,78 +14044,62 @@
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 30,
-          "key" : [],
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
           "match_type" : "exact",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : false,
+          "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_18"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [32, 33, 9],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
-            "act_18" : "FabricIngress.next.vlan_meta"
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.simple",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.simple",
+            "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 31,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 65,
-            "column" : 10,
-            "source_fragment" : "vlan_meta"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [32, 11],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "FabricIngress.next.simple",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "FabricIngress.next.simple",
-            "nop" : "FabricIngress.next.simple"
-          },
-          "default_entry" : {
-            "action_id" : 11,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
           "name" : "FabricIngress.next.simple",
-          "id" : 32,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 122,
+            "line" : 141,
             "column" : 10,
             "source_fragment" : "simple"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
+              "name" : "next_id",
               "target" : ["scalars", "fabric_metadata_t.next_id"],
               "mask" : null
             }
@@ -14626,22 +14110,132 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33, 34, 35, 36, 37, 38, 8],
-          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
-          "base_default_next" : null,
+          "action_ids" : [34, 35, 36, 10],
+          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
-            "__HIT__" : "tbl_act_19",
-            "__MISS__" : "tbl_act_20"
+            "FabricIngress.next.output_simple" : "FabricIngress.next.hashed",
+            "FabricIngress.next.routing_simple" : "FabricIngress.next.hashed",
+            "FabricIngress.next.mpls_routing_simple" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 8,
-            "action_const" : false,
+            "action_id" : 10,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
+          "name" : "FabricIngress.next.hashed",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 180,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [37, 38, 39, 11],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
+          "id" : 31,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [40, 12],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 12,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 32,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [31, 8],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_51",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_51",
+            "nop" : "node_51"
+          },
+          "default_entry" : {
+            "action_id" : 8,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
           "id" : 33,
           "key" : [],
           "match_type" : "exact",
@@ -14650,21 +14244,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_50",
+          "action_ids" : [59],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_53",
           "next_tables" : {
-            "act_19" : "node_50"
+            "act_17" : "node_53"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
+          "name" : "tbl_act_18",
           "id" : 34,
           "key" : [],
           "match_type" : "exact",
@@ -14673,290 +14267,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_50",
-          "next_tables" : {
-            "act_20" : "node_50"
-          },
-          "default_entry" : {
-            "action_id" : 64,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 35,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 175,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "FabricIngress.next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [39, 40, 41, 9],
-          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_21",
-            "__MISS__" : "tbl_act_22"
-          }
-        },
-        {
-          "name" : "tbl_act_21",
-          "id" : 36,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_54",
-          "next_tables" : {
-            "act_21" : "node_54"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_22",
-          "id" : 37,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_54",
-          "next_tables" : {
-            "act_22" : "node_54"
-          },
-          "default_entry" : {
-            "action_id" : 66,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 38,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 207,
-            "column" : 10,
-            "source_fragment" : "multicast"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42, 10],
-          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_23",
-            "__MISS__" : "tbl_act_24"
-          },
-          "default_entry" : {
-            "action_id" : 10,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_23",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_58",
-          "next_tables" : {
-            "act_23" : "node_58"
-          },
-          "default_entry" : {
-            "action_id" : 67,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_24",
-          "id" : 40,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_58",
-          "next_tables" : {
-            "act_24" : "node_58"
-          },
-          "default_entry" : {
-            "action_id" : 68,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_25",
-          "id" : 41,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [69],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_60",
-          "next_tables" : {
-            "act_25" : "node_60"
-          },
-          "default_entry" : {
-            "action_id" : 69,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_26",
-          "id" : 42,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [70],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_66",
-          "next_tables" : {
-            "act_26" : "node_66"
-          },
-          "default_entry" : {
-            "action_id" : 70,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_27",
-          "id" : 43,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_66",
-          "next_tables" : {
-            "act_27" : "node_66"
-          },
-          "default_entry" : {
-            "action_id" : 71,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_28",
-          "id" : 44,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_68",
-          "next_tables" : {
-            "act_28" : "node_68"
-          },
-          "default_entry" : {
-            "action_id" : 72,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_29",
-          "id" : 45,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_29"],
+          "action_ids" : [60],
+          "actions" : ["act_18"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_29" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_18" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 73,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14964,7 +14282,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 46,
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -14974,7 +14292,7 @@
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             }
@@ -14986,32 +14304,32 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [15, 2],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
             "FabricIngress.process_set_source_sink.int_set_source" : "FabricIngress.process_set_source_sink.tb_set_sink",
-            "NoAction" : "FabricIngress.process_set_source_sink.tb_set_sink"
+            "nop" : "FabricIngress.process_set_source_sink.tb_set_sink"
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 47,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "tb_set_sink"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_spec",
+              "name" : "eg_spec",
               "target" : ["standard_metadata", "egress_spec"],
               "mask" : null
             }
@@ -15023,22 +14341,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [16, 3],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"],
-          "base_default_next" : "node_72",
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
+          "base_default_next" : "node_57",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_72",
-            "NoAction" : "node_72"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_57",
+            "nop" : "node_57"
           },
           "default_entry" : {
             "action_id" : 3,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 48,
+          "name" : "tbl_act_19",
+          "id" : 37,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15046,14 +14364,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_30"],
+          "action_ids" : [61],
+          "actions" : ["act_19"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_30" : null
+            "act_19" : null
           },
           "default_entry" : {
-            "action_id" : 74,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15062,13 +14380,13 @@
       ],
       "action_profiles" : [
         {
-          "name" : "FabricIngress.next.ecmp_selector",
+          "name" : "FabricIngress.next.hashed_selector",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 145,
+            "line" : 161,
             "column" : 55,
-            "source_fragment" : "ecmp_selector"
+            "source_fragment" : "hashed_selector"
           },
           "max_size" : 64,
           "selector" : {
@@ -15088,11 +14406,11 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
               }
             ]
           }
@@ -15144,7 +14462,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+                    "value" : ["scalars", "spgw_normalizer_hasReturned"]
                   }
                 }
               }
@@ -15181,7 +14499,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -15197,14 +14515,67 @@
             }
           },
           "true_next" : "tbl_act_4",
-          "false_next" : "tbl_act_5"
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_13",
+          "name" : "node_12",
           "id" : 4,
           "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 102,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["vlan_tag", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_5",
+          "false_next" : "node_14"
+        },
+        {
+          "name" : "node_14",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_6",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+        },
+        {
+          "name" : "node_19",
+          "id" : 6,
+          "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 139,
+            "line" : 143,
             "column" : 12,
             "source_fragment" : "gtpu.isValid()"
           },
@@ -15223,11 +14594,11 @@
           "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
         },
         {
-          "name" : "node_17",
-          "id" : 5,
+          "name" : "node_23",
+          "id" : 7,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 143,
+            "line" : 147,
             "column" : 16,
             "source_fragment" : "!s1u_filter_table.apply().hit"
           },
@@ -15243,18 +14614,18 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_tmp_1"]
+                    "value" : ["scalars", "spgw_ingress_tmp"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_drop_now",
-          "false_next" : "tbl_act_8"
+          "true_next" : "tbl_act_10",
+          "false_next" : "tbl_act_11"
         },
         {
-          "name" : "node_24",
-          "id" : 6,
+          "name" : "node_30",
+          "id" : 8,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15262,16 +14633,16 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "spgw_ingress_tmp_2"]
+                "value" : ["scalars", "spgw_ingress_tmp_0"]
               }
             }
           },
-          "true_next" : "tbl_act_11",
-          "false_next" : "tbl_act_12"
+          "true_next" : "tbl_act_14",
+          "false_next" : "tbl_act_15"
         },
         {
-          "name" : "node_27",
-          "id" : 7,
+          "name" : "node_33",
+          "id" : 9,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15284,39 +14655,55 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+                    "value" : ["scalars", "spgw_ingress_hasReturned"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
-        },
-        {
-          "name" : "node_32",
-          "id" : 8,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "filtering_tmp_0"]
-              }
-            }
-          },
-          "true_next" : "FabricIngress.filtering.fwd_classifier",
-          "false_next" : "tbl_act_16"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_35"
         },
         {
           "name" : "node_35",
-          "id" : 9,
+          "id" : 10,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_36",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_36",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 191,
-            "column" : 11,
+            "line" : 131,
+            "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
           "expression" : {
@@ -15334,14 +14721,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_37"
+          "false_next" : "node_38"
         },
         {
-          "name" : "node_37",
-          "id" : 10,
+          "name" : "node_38",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 192,
+            "line" : 132,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -15364,10 +14751,10 @@
         },
         {
           "name" : "node_40",
-          "id" : 11,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 198,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -15390,10 +14777,10 @@
         },
         {
           "name" : "node_42",
-          "id" : 12,
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 200,
+            "line" : 135,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
           },
@@ -15412,204 +14799,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v6",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_50",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 219,
-            "column" : 12,
-            "source_fragment" : "!simple.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_4"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_60"
-        },
-        {
-          "name" : "node_54",
-          "id" : 14,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 220,
-            "column" : 16,
-            "source_fragment" : "!hashed.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_3"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_60"
-        },
-        {
-          "name" : "node_58",
+          "name" : "node_45",
           "id" : 15,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 221,
-            "column" : 20,
-            "source_fragment" : "!multicast.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_2"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_60"
-        },
-        {
-          "name" : "node_60",
-          "id" : 16,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_hasReturned_0"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_61",
-          "false_next" : "node_66"
-        },
-        {
-          "name" : "node_61",
-          "id" : 17,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
+            "filename" : "fabric.p4",
+            "line" : 70,
             "column" : 12,
-            "source_fragment" : "!hdr.mpls.isValid()"
+            "source_fragment" : "fabric_metadata.skip_next == false"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
+              "op" : "==",
+              "left" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["mpls", "$valid$"]
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
                   }
                 }
-              }
-            }
-          },
-          "true_next" : "node_62",
-          "false_next" : "node_66"
-        },
-        {
-          "name" : "node_62",
-          "id" : 18,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 229,
-            "column" : 15,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
+              },
               "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
+                "type" : "bool",
+                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_64"
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_64",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 233,
-            "column" : 21,
-            "source_fragment" : "hdr.ipv6.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv6", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_66"
-        },
-        {
-          "name" : "node_66",
-          "id" : 20,
+          "name" : "node_51",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -15627,15 +14857,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
-          "false_next" : "node_68"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_53"
         },
         {
-          "name" : "node_68",
-          "id" : 21,
+          "name" : "node_53",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -15653,15 +14883,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_29",
+          "true_next" : "tbl_act_18",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_72",
-          "id" : 22,
+          "name" : "node_57",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 82,
+            "line" : 86,
             "column" : 11,
             "source_fragment" : "fabric_metadata.int_meta.sink == true"
           },
@@ -15687,7 +14917,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_30"
+          "true_next" : "tbl_act_19"
         }
       ]
     },
@@ -15696,15 +14926,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_76",
+      "init_table" : "node_61",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 49,
+          "name" : "tbl_act_20",
+          "id" : 38,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15712,22 +14942,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [121],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_80",
+          "action_ids" : [110],
+          "actions" : ["act_20"],
+          "base_default_next" : "tbl_act_21",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_80"
+            "act_20" : "tbl_act_21"
           },
           "default_entry" : {
-            "action_id" : 121,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 50,
+          "name" : "tbl_act_21",
+          "id" : 39,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15735,45 +14965,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_31",
-          "next_tables" : {
-            "drop_now" : "tbl_act_31"
-          },
-          "default_entry" : {
-            "action_id" : 81,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_31",
-          "id" : 51,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [123],
-          "actions" : ["act_31"],
+          "action_ids" : [111],
+          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_31" : null
+            "act_21" : null
           },
           "default_entry" : {
-            "action_id" : 123,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_1",
-          "id" : 52,
+          "name" : "tbl_act_22",
+          "id" : 40,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15781,14 +14988,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [112],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_22" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 82,
+            "action_id" : 112,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 41,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [106],
+          "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 106,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 42,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [107],
+          "actions" : ["FabricEgress.egress_next.set_mpls"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15796,23 +15049,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 53,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 258,
+            "line" : 285,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_port",
+              "name" : "eg_port",
               "target" : ["standard_metadata", "egress_port"],
               "mask" : null
             }
@@ -15823,23 +15076,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [122, 80],
+          "action_ids" : [109, 65],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_86",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_86",
-            "nop" : "node_86"
+            "__HIT__" : "tbl_act_23",
+            "__MISS__" : "tbl_act_24"
           },
           "default_entry" : {
-            "action_id" : 80,
-            "action_const" : false,
+            "action_id" : 65,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 54,
+          "name" : "tbl_act_23",
+          "id" : 44,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15847,14 +15100,221 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_88",
+          "action_ids" : [113],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_75",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_88"
+            "act_23" : "node_75"
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 113,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_24",
+          "id" : 45,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [114],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_75",
+          "next_tables" : {
+            "act_24" : "node_75"
+          },
+          "default_entry" : {
+            "action_id" : 114,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 46,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [108],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_78",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_78"
+          },
+          "default_entry" : {
+            "action_id" : 108,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_25",
+          "id" : 47,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [116],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_80",
+          "next_tables" : {
+            "act_26" : "node_80"
+          },
+          "default_entry" : {
+            "action_id" : 116,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_26",
+          "id" : 48,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [115],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_90",
+          "next_tables" : {
+            "act_25" : "node_90"
+          },
+          "default_entry" : {
+            "action_id" : 115,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_27",
+          "id" : 49,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [118],
+          "actions" : ["act_28"],
+          "base_default_next" : "node_84",
+          "next_tables" : {
+            "act_28" : "node_84"
+          },
+          "default_entry" : {
+            "action_id" : 118,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_28",
+          "id" : 50,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [117],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_90",
+          "next_tables" : {
+            "act_27" : "node_90"
+          },
+          "default_entry" : {
+            "action_id" : 117,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_29",
+          "id" : 51,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [120],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_88",
+          "next_tables" : {
+            "act_30" : "node_88"
+          },
+          "default_entry" : {
+            "action_id" : 120,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_30",
+          "id" : 52,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [119],
+          "actions" : ["act_29"],
+          "base_default_next" : "node_90",
+          "next_tables" : {
+            "act_29" : "node_90"
+          },
+          "default_entry" : {
+            "action_id" : 119,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_egress_gtpu_encap",
+          "id" : 53,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [68],
+          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
+          "base_default_next" : "node_92",
+          "next_tables" : {
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_92"
+          },
+          "default_entry" : {
+            "action_id" : 68,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15862,36 +15322,36 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 55,
+          "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 65,
+            "line" : 66,
             "column" : 10,
             "source_fragment" : "tb_int_source"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             }
           ],
@@ -15901,23 +15361,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84, 75],
-          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_91",
+          "action_ids" : [69, 62],
+          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
+          "base_default_next" : "node_95",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_91",
-            "NoAction" : "node_91"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_95",
+            "nop" : "node_95"
           },
           "default_entry" : {
-            "action_id" : 75,
-            "action_const" : false,
+            "action_id" : 62,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 56,
+          "name" : "tbl_act_31",
+          "id" : 55,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15925,14 +15385,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [124],
-          "actions" : ["act_32"],
+          "action_ids" : [121],
+          "actions" : ["act_31"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_32" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_31" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 124,
+            "action_id" : 121,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15940,17 +15400,17 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 57,
+          "id" : 56,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 271,
+            "line" : 315,
             "column" : 10,
             "source_fragment" : "tb_int_insert"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.int_header.is_valid",
+              "name" : "int_is_valid",
               "target" : ["int_header", "$valid$"],
               "mask" : null
             }
@@ -15961,23 +15421,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85, 79],
+          "action_ids" : [70, 63],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_94",
+          "base_default_next" : "node_98",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_94",
-            "nop" : "node_94"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_98",
+            "nop" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 58,
+          "name" : "tbl_act_32",
+          "id" : 57,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15985,14 +15445,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [125],
-          "actions" : ["act_33"],
-          "base_default_next" : "node_96",
+          "action_ids" : [122],
+          "actions" : ["act_32"],
+          "base_default_next" : "node_100",
           "next_tables" : {
-            "act_33" : "node_96"
+            "act_32" : "node_100"
           },
           "default_entry" : {
-            "action_id" : 125,
+            "action_id" : 122,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16000,10 +15460,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 59,
+          "id" : 58,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 286,
+            "line" : 331,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0003"
           },
@@ -16021,7 +15481,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 76],
+          "action_ids" : [71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 66],
           "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" : {
@@ -16044,7 +15504,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 66,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16053,7 +15513,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 310,
+                "line" : 354,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0003_i0()"
               },
@@ -16064,7 +15524,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 1
@@ -16072,7 +15532,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 311,
+                "line" : 355,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0003_i1()"
               },
@@ -16083,7 +15543,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 2
@@ -16091,7 +15551,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 312,
+                "line" : 356,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0003_i2()"
               },
@@ -16102,7 +15562,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 3
@@ -16110,7 +15570,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 313,
+                "line" : 357,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0003_i3()"
               },
@@ -16121,7 +15581,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 4
@@ -16129,7 +15589,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 314,
+                "line" : 358,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0003_i4()"
               },
@@ -16140,7 +15600,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 5
@@ -16148,7 +15608,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 315,
+                "line" : 359,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0003_i5()"
               },
@@ -16159,7 +15619,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 6
@@ -16167,7 +15627,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 316,
+                "line" : 360,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0003_i6()"
               },
@@ -16178,7 +15638,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 7
@@ -16186,7 +15646,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 317,
+                "line" : 361,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0003_i7()"
               },
@@ -16197,7 +15657,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 93,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 8
@@ -16205,7 +15665,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 318,
+                "line" : 362,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0003_i8()"
               },
@@ -16216,7 +15676,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 94,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 9
@@ -16224,7 +15684,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 319,
+                "line" : 363,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0003_i9()"
               },
@@ -16235,7 +15695,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 95,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 10
@@ -16243,7 +15703,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 320,
+                "line" : 364,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0003_i10()"
               },
@@ -16254,7 +15714,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 11
@@ -16262,7 +15722,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 321,
+                "line" : 365,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0003_i11()"
               },
@@ -16273,7 +15733,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 12
@@ -16281,7 +15741,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 322,
+                "line" : 366,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0003_i12()"
               },
@@ -16292,7 +15752,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 13
@@ -16300,7 +15760,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 323,
+                "line" : 367,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0003_i13()"
               },
@@ -16311,7 +15771,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 14
@@ -16319,7 +15779,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 324,
+                "line" : 368,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0003_i14()"
               },
@@ -16330,7 +15790,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 15
@@ -16338,7 +15798,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 325,
+                "line" : 369,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0003_i15()"
               },
@@ -16349,7 +15809,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 16
@@ -16358,10 +15818,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 60,
+          "id" : 59,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 330,
+            "line" : 375,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0407"
           },
@@ -16379,30 +15839,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 77],
+          "action_ids" : [87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 67],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_34",
+          "base_default_next" : "tbl_act_33",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_34",
-            "NoAction" : "tbl_act_34"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_33",
+            "NoAction" : "tbl_act_33"
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 67,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16411,7 +15871,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 354,
+                "line" : 398,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0407_i0()"
               },
@@ -16422,7 +15882,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 1
@@ -16430,7 +15890,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 355,
+                "line" : 399,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0407_i1()"
               },
@@ -16441,7 +15901,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 103,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 2
@@ -16449,7 +15909,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 356,
+                "line" : 400,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0407_i2()"
               },
@@ -16460,7 +15920,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 3
@@ -16468,7 +15928,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 357,
+                "line" : 401,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0407_i3()"
               },
@@ -16479,7 +15939,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 4
@@ -16487,7 +15947,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 358,
+                "line" : 402,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0407_i4()"
               },
@@ -16498,7 +15958,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 5
@@ -16506,7 +15966,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 359,
+                "line" : 403,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0407_i5()"
               },
@@ -16517,7 +15977,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 6
@@ -16525,7 +15985,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 360,
+                "line" : 404,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0407_i6()"
               },
@@ -16536,7 +15996,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 93,
                 "action_data" : []
               },
               "priority" : 7
@@ -16544,7 +16004,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 361,
+                "line" : 405,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0407_i7()"
               },
@@ -16555,7 +16015,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 94,
                 "action_data" : []
               },
               "priority" : 8
@@ -16563,7 +16023,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 362,
+                "line" : 406,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0407_i8()"
               },
@@ -16574,7 +16034,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 95,
                 "action_data" : []
               },
               "priority" : 9
@@ -16582,7 +16042,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 363,
+                "line" : 407,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0407_i9()"
               },
@@ -16593,7 +16053,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 96,
                 "action_data" : []
               },
               "priority" : 10
@@ -16601,7 +16061,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 364,
+                "line" : 408,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0407_i10()"
               },
@@ -16612,7 +16072,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 97,
                 "action_data" : []
               },
               "priority" : 11
@@ -16620,7 +16080,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 365,
+                "line" : 409,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0407_i11()"
               },
@@ -16631,7 +16091,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 98,
                 "action_data" : []
               },
               "priority" : 12
@@ -16639,7 +16099,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 366,
+                "line" : 410,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0407_i12()"
               },
@@ -16650,7 +16110,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 99,
                 "action_data" : []
               },
               "priority" : 13
@@ -16658,7 +16118,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 367,
+                "line" : 411,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0407_i13()"
               },
@@ -16669,7 +16129,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 100,
                 "action_data" : []
               },
               "priority" : 14
@@ -16677,7 +16137,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 368,
+                "line" : 412,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0407_i14()"
               },
@@ -16688,7 +16148,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 101,
                 "action_data" : []
               },
               "priority" : 15
@@ -16696,7 +16156,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 369,
+                "line" : 413,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0407_i15()"
               },
@@ -16707,7 +16167,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 102,
                 "action_data" : []
               },
               "priority" : 16
@@ -16715,6 +16175,29 @@
           ]
         },
         {
+          "name" : "tbl_act_33",
+          "id" : 60,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [124],
+          "actions" : ["act_34"],
+          "base_default_next" : "node_104",
+          "next_tables" : {
+            "act_34" : "node_104"
+          },
+          "default_entry" : {
+            "action_id" : 124,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_34",
           "id" : 61,
           "key" : [],
@@ -16724,14 +16207,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [127],
-          "actions" : ["act_35"],
-          "base_default_next" : "node_100",
+          "action_ids" : [123],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_106",
           "next_tables" : {
-            "act_35" : "node_100"
+            "act_33" : "node_106"
           },
           "default_entry" : {
-            "action_id" : 127,
+            "action_id" : 123,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16747,14 +16230,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [126],
-          "actions" : ["act_34"],
-          "base_default_next" : "node_102",
+          "action_ids" : [125],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_108",
           "next_tables" : {
-            "act_34" : "node_102"
+            "act_35" : "node_108"
           },
           "default_entry" : {
-            "action_id" : 126,
+            "action_id" : 125,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16770,37 +16253,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [128],
+          "action_ids" : [126],
           "actions" : ["act_36"],
-          "base_default_next" : "node_104",
+          "base_default_next" : "node_110",
           "next_tables" : {
-            "act_36" : "node_104"
+            "act_36" : "node_110"
           },
           "default_entry" : {
-            "action_id" : 128,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_37",
-          "id" : 64,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [129],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_106",
-          "next_tables" : {
-            "act_37" : "node_106"
-          },
-          "default_entry" : {
-            "action_id" : 129,
+            "action_id" : 126,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16808,10 +16268,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 65,
+          "id" : 64,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 85,
+            "line" : 86,
             "column" : 10,
             "source_fragment" : "tb_generate_report"
           },
@@ -16822,15 +16282,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [118, 78],
-          "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "NoAction"],
-          "base_default_next" : "node_108",
+          "action_ids" : [103, 64],
+          "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
+          "base_default_next" : "node_112",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_108",
-            "NoAction" : "node_108"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_112",
+            "nop" : "node_112"
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 64,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16838,6 +16298,29 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
+          "id" : 65,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [104],
+          "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" : 104,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_process_int_main_process_int_sink_int_sink",
           "id" : 66,
           "key" : [],
           "match_type" : "exact",
@@ -16846,37 +16329,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [119],
-          "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" : 119,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 67,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [120],
+          "action_ids" : [105],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 120,
+            "action_id" : 105,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16886,11 +16346,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_76",
-          "id" : 23,
+          "name" : "node_61",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -16916,14 +16376,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_77"
+          "false_next" : "node_62"
         },
         {
-          "name" : "node_77",
-          "id" : 24,
+          "name" : "node_62",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -16941,65 +16401,15 @@
               }
             }
           },
-          "true_next" : "node_78",
-          "false_next" : "node_83"
+          "true_next" : "node_63",
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_78",
-          "id" : 25,
+          "name" : "node_63",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["vlan_tag", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_80"
-        },
-        {
-          "name" : "node_80",
-          "id" : 26,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -17051,15 +16461,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
-          "false_next" : "tbl_act_31"
+          "true_next" : "tbl_act_20",
+          "false_next" : "tbl_act_21"
         },
         {
-          "name" : "node_83",
-          "id" : 27,
+          "name" : "node_66",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -17104,17 +16514,269 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_1",
+          "true_next" : "tbl_act_22",
+          "false_next" : "node_68"
+        },
+        {
+          "name" : "node_68",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 304,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_69",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_69",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 305,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_86",
+          "name" : "node_75",
+          "id" : 25,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_76",
+          "false_next" : "node_78"
+        },
+        {
+          "name" : "node_76",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_78"
+        },
+        {
+          "name" : "node_78",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 318,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_25",
+          "false_next" : "node_82"
+        },
+        {
+          "name" : "node_80",
           "id" : 28,
           "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_26",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_82",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 322,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_86"
+        },
+        {
+          "name" : "node_84",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_28",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_86",
+          "id" : 31,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 21,
+            "source_fragment" : "hdr.ipv6.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv6", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_29",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_88",
+          "id" : 32,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 329,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv6.hop_limit == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv6", "hop_limit"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_30",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_90",
+          "id" : 33,
+          "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 221,
+            "line" : 226,
             "column" : 12,
-            "source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK"
+            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
           },
           "expression" : {
             "type" : "expression",
@@ -17131,14 +16793,14 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_88"
+          "false_next" : "node_92"
         },
         {
-          "name" : "node_88",
-          "id" : 29,
+          "name" : "node_92",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 98,
+            "line" : 102,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port != 255 && ..."
           },
@@ -17211,14 +16873,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_89"
+          "true_next" : "node_93"
         },
         {
-          "name" : "node_89",
-          "id" : 30,
+          "name" : "node_93",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 102,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "fabric_metadata.int_meta.source == true"
           },
@@ -17244,14 +16906,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_91"
+          "false_next" : "node_95"
         },
         {
-          "name" : "node_91",
-          "id" : 31,
+          "name" : "node_95",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 106,
+            "line" : 110,
             "column" : 15,
             "source_fragment" : "hdr.int_header.isValid()"
           },
@@ -17267,14 +16929,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_32"
+          "true_next" : "tbl_act_31"
         },
         {
-          "name" : "node_94",
-          "id" : 32,
+          "name" : "node_98",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 375,
+            "line" : 419,
             "column" : 12,
             "source_fragment" : "fmeta.int_meta.transit == false"
           },
@@ -17299,12 +16961,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_96"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_100"
         },
         {
-          "name" : "node_96",
-          "id" : 33,
+          "name" : "node_100",
+          "id" : 38,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -17317,21 +16979,21 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
                   }
                 }
               }
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_106"
+          "false_next" : "node_110"
         },
         {
-          "name" : "node_100",
-          "id" : 34,
+          "name" : "node_104",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 383,
+            "line" : 427,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -17346,15 +17008,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_35",
-          "false_next" : "node_102"
+          "true_next" : "tbl_act_34",
+          "false_next" : "node_106"
         },
         {
-          "name" : "node_102",
-          "id" : 35,
+          "name" : "node_106",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 386,
+            "line" : 430,
             "column" : 12,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -17369,15 +17031,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_36",
-          "false_next" : "node_104"
+          "true_next" : "tbl_act_35",
+          "false_next" : "node_108"
         },
         {
-          "name" : "node_104",
-          "id" : 36,
+          "name" : "node_108",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 389,
+            "line" : 433,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.isValid()"
           },
@@ -17392,15 +17054,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_106"
+          "true_next" : "tbl_act_36",
+          "false_next" : "node_110"
         },
         {
-          "name" : "node_106",
-          "id" : 37,
+          "name" : "node_110",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 111,
+            "line" : 115,
             "column" : 20,
             "source_fragment" : "standard_metadata.instance_type == 1"
           },
@@ -17419,14 +17081,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_108"
+          "false_next" : "node_112"
         },
         {
-          "name" : "node_108",
-          "id" : 38,
+          "name" : "node_112",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 115,
+            "line" : 119,
             "column" : 20,
             "source_fragment" : "fabric_metadata.int_meta.sink == true"
           },
@@ -17487,7 +17149,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },