diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 5672dc8..39b7f71 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -4,31 +4,35 @@
       "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],
-        ["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]
       ]
     },
     {
@@ -65,7 +69,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -75,7 +79,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -111,8 +115,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]
       ]
@@ -133,22 +137,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 8,
       "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" : 9,
-      "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],
@@ -162,7 +155,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 10,
+      "id" : 9,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -174,7 +167,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -182,7 +175,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -190,7 +183,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 13,
+      "id" : 12,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -200,7 +193,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 14,
+      "id" : 13,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -219,14 +212,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 15,
+      "id" : 14,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 16,
+      "id" : 15,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -234,14 +227,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 17,
+      "id" : 16,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 18,
+      "id" : 17,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -249,21 +242,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 19,
+      "id" : 18,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 20,
+      "id" : 19,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 21,
+      "id" : 20,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -271,14 +264,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 22,
+      "id" : 21,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 23,
+      "id" : 22,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -288,7 +281,7 @@
     },
     {
       "name" : "spgw_meta_t",
-      "id" : 24,
+      "id" : 23,
       "fields" : [
         ["direction", 2, false],
         ["ipv4_len", 16, false],
@@ -300,7 +293,7 @@
     },
     {
       "name" : "int_metadata_t",
-      "id" : 25,
+      "id" : 24,
       "fields" : [
         ["source", 1, 0],
         ["transit", 1, 0],
@@ -344,58 +337,58 @@
       "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,
-      "header_type" : "ipv4_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 11,
-      "header_type" : "arp_t",
+      "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -605,6 +598,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" : [
@@ -622,12 +641,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -641,7 +654,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -662,12 +675,52 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "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"
@@ -687,13 +740,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" : [
@@ -708,7 +761,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",
@@ -734,13 +813,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -768,7 +847,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",
@@ -811,29 +903,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 6,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 7,
           "parser_ops" : [
@@ -850,11 +919,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"
@@ -863,11 +932,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"
@@ -899,11 +968,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"
@@ -912,11 +981,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"
@@ -938,7 +1007,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -973,7 +1042,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp"]
                 },
                 {
                   "type" : "expression",
@@ -1032,7 +1101,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             }
           ]
         },
@@ -1062,7 +1131,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -1121,11 +1190,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"
@@ -1134,11 +1203,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"
@@ -1173,7 +1242,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "last_ipv4_dscp"]
+              "value" : ["scalars", "last_ipv4_dscp_0"]
             }
           ]
         },
@@ -1266,11 +1335,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "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", "intl4_tail"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "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", "intl4_tail"]
     }
   ],
   "meter_arrays" : [],
@@ -1306,7 +1375,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"
       }
@@ -1318,7 +1387,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -1330,7 +1399,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -1342,7 +1411,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1354,45 +1423,45 @@
       "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",
+      "name" : "FabricIngress.acl.acl_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
+      "binding" : "FabricIngress.acl.acl",
       "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
         "column" : 50,
         "source_fragment" : "acl_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 8,
       "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.simple_counter",
+      "name" : "FabricIngress.next.xconnect_counter",
       "id" : 9,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.simple",
+      "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 91,
         "column" : 50,
-        "source_fragment" : "simple_counter"
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
@@ -1402,7 +1471,7 @@
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
@@ -1414,7 +1483,7 @@
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
@@ -1424,7 +1493,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -1436,7 +1505,7 @@
       "id" : 13,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -1462,7 +1531,7 @@
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -1536,7 +1605,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1657,55 +1726,55 @@
   "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" : []
@@ -1717,35 +1786,8 @@
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 10,
-      "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"
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricIngress.spgw_ingress.gtpu_decap",
-      "id" : 11,
+      "id" : 10,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1758,7 +1800,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 54,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
           }
@@ -1773,7 +1815,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
           }
@@ -1788,7 +1830,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
           }
@@ -1797,7 +1839,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
-      "id" : 12,
+      "id" : 11,
       "runtime_data" : [
         {
           "name" : "teid",
@@ -1827,9 +1869,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"
           }
         },
         {
@@ -1846,9 +1888,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"
           }
         },
         {
@@ -1865,16 +1907,16 @@
           ],
           "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"
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 13,
+      "id" : 12,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1909,179 +1951,16 @@
       ]
     },
     {
-      "name" : "FabricIngress.filtering.drop",
-      "id" : 14,
+      "name" : "FabricIngress.filtering.deny",
+      "id" : 13,
       "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" : 15,
-      "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" : 16,
-      "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",
@@ -2100,22 +1979,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" : 17,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 14,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 15,
+      "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" : 18,
+      "id" : 16,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2137,7 +2076,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -2146,6 +2085,87 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
+      "id" : 17,
+      "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.forwarding.pop_mpls_and_next",
+      "id" : 18,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
+          }
+        },
+        {
+          "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.forwarding.set_next_id_routing_v4",
       "id" : 19,
       "runtime_data" : [
         {
@@ -2168,61 +2188,21 @@
           ],
           "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",
+      "name" : "FabricIngress.forwarding.nop_routing_v4",
       "id" : 20,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
-          }
-        },
-        {
-          "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" : 61,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
+      "runtime_data" : [],
+      "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
+      "name" : "FabricIngress.acl.set_next_id_acl",
       "id" : 21,
       "runtime_data" : [
         {
@@ -2244,8 +2224,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -2253,46 +2233,9 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_routing_v4",
+      "name" : "FabricIngress.acl.punt_to_cpu",
       "id" : 22,
       "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
-      "id" : 23,
-      "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" : 110,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
-      "id" : 24,
-      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
@@ -2307,27 +2250,46 @@
             }
           ],
           "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",
-      "id" : 25,
+      "name" : "FabricIngress.acl.clone_to_cpu",
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2353,8 +2315,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"
           }
@@ -2362,34 +2324,63 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
-      "id" : 26,
+      "name" : "FabricIngress.acl.drop",
+      "id" : 24,
       "runtime_data" : [],
       "primitives" : [
         {
           "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",
-      "id" : 27,
+      "name" : "FabricIngress.acl.nop_acl",
+      "id" : 25,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 28,
+      "id" : 26,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
+          "name" : "vlan_id",
           "bitwidth" : 12
         }
       ],
@@ -2399,7 +2390,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
             },
             {
               "type" : "runtime_data",
@@ -2408,15 +2399,77 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 61,
+            "line" : 70,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.output_simple",
+      "name" : "FabricIngress.next.output_xconnect",
+      "id" : 27,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 28,
+      "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/next.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
       "id" : 29,
       "runtime_data" : [
         {
@@ -2439,24 +2492,28 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.set_vlan_output",
+      "name" : "FabricIngress.next.routing_hashed",
       "id" : 30,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
           "name" : "port_num",
           "bitwidth" : 9
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "dmac",
+          "bitwidth" : 48
         }
       ],
       "primitives" : [
@@ -2465,18 +2522,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["ethernet", "src_addr"]
             },
             {
               "type" : "runtime_data",
-              "value" : 0
+              "value" : 1
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 90,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+            "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; ..."
           }
         },
         {
@@ -2488,20 +2564,20 @@
             },
             {
               "type" : "runtime_data",
-              "value" : 1
+              "value" : 0
             }
           ],
           "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.mpls_routing_hashed",
       "id" : 31,
       "runtime_data" : [
         {
@@ -2515,6 +2591,10 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -2523,6 +2603,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"]
             },
             {
@@ -2532,7 +2631,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2570,960 +2669,19 @@
           ],
           "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.set_mcast_group_id",
       "id" : 32,
       "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" : 85,
-            "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_simple",
-      "id" : 33,
-      "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" : 85,
-            "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.l3_routing_vlan",
-      "id" : 34,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "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" : ["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"]
-            },
-            {
-              "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.l3_routing_hashed",
-      "id" : 35,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        }
-      ],
-      "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; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
-      "id" : 36,
-      "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" : 37,
-      "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" : 38,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -3542,9 +2700,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"
           }
         },
         {
@@ -3571,7 +2729,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -3580,7 +2738,7 @@
     },
     {
       "name" : "act",
-      "id" : 39,
+      "id" : 33,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3588,7 +2746,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3616,7 +2774,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 40,
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3629,7 +2787,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -3644,7 +2802,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -3654,7 +2812,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3676,7 +2834,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 41,
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3702,7 +2860,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 42,
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3724,7 +2882,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 43,
+      "id" : 37,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3788,7 +2946,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 44,
+      "id" : 38,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3805,7 +2963,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"
           }
@@ -3820,7 +2978,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -3849,7 +3007,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -3858,7 +3016,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 45,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3866,7 +3024,116 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "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" : 40,
+      "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" : 41,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -3887,8 +3154,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 46,
+      "name" : "act_8",
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3896,7 +3163,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -3917,8 +3184,25 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 47,
+      "name" : "act_9",
+      "id" : 43,
+      "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" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3935,7 +3219,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 137,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -3943,94 +3227,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 48,
-      "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",
-      "id" : 49,
-      "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" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 50,
-      "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" : 51,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4038,26 +3236,7 @@
           "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",
@@ -4073,19 +3252,13 @@
                 }
               }
             }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 153,
-            "column" : 12,
-            "source_fragment" : "return"
-          }
+          ]
         }
       ]
     },
     {
       "name" : "act_12",
-      "id" : 52,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4093,7 +3266,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4115,7 +3288,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 53,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4123,25 +3296,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" : 54,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4149,7 +3322,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",
@@ -4165,13 +3357,19 @@
                 }
               }
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 157,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
         }
       ]
     },
     {
       "name" : "act_15",
-      "id" : 55,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4179,7 +3377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4201,7 +3399,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 56,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4209,346 +3407,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" : 57,
-      "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" : 58,
-      "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" : 59,
-      "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" : 60,
-      "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" : 61,
-      "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" : 62,
-      "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" : 63,
-      "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" : 64,
-      "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" : 65,
-      "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" : 66,
-      "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" : 67,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4578,7 +3455,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
           }
@@ -4597,7 +3474,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)"
           }
@@ -4605,8 +3482,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 68,
+      "name" : "act_18",
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4636,7 +3513,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
           }
@@ -4655,7 +3532,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)"
           }
@@ -4663,92 +3540,38 @@
       ]
     },
     {
-      "name" : "NoAction",
-      "id" : 69,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 70,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 71,
+      "name" : "nop",
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 72,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 73,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 74,
+      "name" : "NoAction",
+      "id" : 56,
       "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" : 75,
+      "name" : "NoAction",
+      "id" : 57,
       "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" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 76,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4761,7 +3584,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 185,
+            "line" : 190,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
           }
@@ -4780,7 +3603,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 186,
+            "line" : 191,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
           }
@@ -4799,7 +3622,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 111,
+            "line" : 119,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -4818,7 +3641,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 188,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dscp = 0"
           }
@@ -4837,7 +3660,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 189,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.ecn = 0"
           }
@@ -4879,7 +3702,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 190,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
           }
@@ -4898,7 +3721,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 192,
+            "line" : 197,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
           }
@@ -4917,7 +3740,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 193,
+            "line" : 198,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
           }
@@ -4936,7 +3759,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 194,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
           }
@@ -4955,7 +3778,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -4974,7 +3797,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4993,9 +3816,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"
           }
         },
         {
@@ -5012,9 +3835,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"
           }
         },
         {
@@ -5031,7 +3854,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 199,
+            "line" : 204,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
           }
@@ -5046,7 +3869,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 201,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
           }
@@ -5056,7 +3879,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "src_port"]
+              "value" : ["gtpu_udp", "sport"]
             },
             {
               "type" : "hexstr",
@@ -5065,9 +3888,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"
           }
         },
         {
@@ -5075,7 +3898,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "dst_port"]
+              "value" : ["gtpu_udp", "dport"]
             },
             {
               "type" : "hexstr",
@@ -5084,9 +3907,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"
           }
         },
         {
@@ -5126,9 +3949,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 ..."
           }
         },
         {
@@ -5145,7 +3968,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 206,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
           }
@@ -5160,7 +3983,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 208,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
           }
@@ -5179,7 +4002,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 209,
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
           }
@@ -5198,7 +4021,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 210,
+            "line" : 215,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
           }
@@ -5217,7 +4040,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 211,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
           }
@@ -5236,7 +4059,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 212,
+            "line" : 217,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
           }
@@ -5255,7 +4078,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 213,
+            "line" : 218,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
           }
@@ -5274,7 +4097,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 214,
+            "line" : 219,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
           }
@@ -5293,7 +4116,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 215,
+            "line" : 220,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
           }
@@ -5312,9 +4135,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"
           }
         },
         {
@@ -5331,16 +4154,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" : 77,
+      "id" : 59,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -5370,7 +4193,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setValid()"
           }
@@ -5389,7 +4212,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 33,
+            "line" : 34,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.int_type = 1"
           }
@@ -5408,7 +4231,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 139,
+            "line" : 147,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -5423,7 +4246,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setValid()"
           }
@@ -5442,7 +4265,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ver = 0"
           }
@@ -5461,7 +4284,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 38,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rep = 0"
           }
@@ -5480,7 +4303,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 39,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.int_header.c = 0"
           }
@@ -5499,7 +4322,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_header.e = 0"
           }
@@ -5518,7 +4341,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rsvd1 = 0"
           }
@@ -5537,7 +4360,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 42,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ins_cnt = ins_cnt; ..."
           }
@@ -5556,7 +4379,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; ..."
           }
@@ -5575,7 +4398,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 44,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = 0"
           }
@@ -5594,7 +4417,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; ..."
           }
@@ -5613,7 +4436,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; ..."
           }
@@ -5632,7 +4455,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 47,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0811 = 0"
           }
@@ -5651,7 +4474,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 48,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_1215 = 0"
           }
@@ -5666,7 +4489,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setValid()"
           }
@@ -5685,7 +4508,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"
           }
@@ -5699,14 +4522,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"
           }
         },
         {
@@ -5723,7 +4546,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 53,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.dscp = hdr.ipv4.dscp"
           }
@@ -5765,7 +4588,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"
           }
@@ -5807,7 +4630,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"
           }
@@ -5826,7 +4649,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 143,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -5835,7 +4658,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 78,
+      "id" : 60,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -5895,13 +4718,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 79,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 80,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5914,7 +4737,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -5933,7 +4756,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5965,7 +4788,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"
           }
@@ -6007,7 +4830,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"
           }
@@ -6049,7 +4872,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"
           }
@@ -6058,7 +4881,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 81,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6071,7 +4894,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6090,7 +4913,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"
           }
@@ -6132,7 +4955,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"
           }
@@ -6174,7 +4997,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"
           }
@@ -6183,7 +5006,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 82,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6196,7 +5019,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6215,7 +5038,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6247,7 +5070,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"
           }
@@ -6262,7 +5085,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6281,7 +5104,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"
           }
@@ -6323,7 +5146,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"
           }
@@ -6365,7 +5188,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"
           }
@@ -6374,7 +5197,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 83,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6387,7 +5210,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6419,7 +5242,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"
           }
@@ -6451,7 +5274,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"
           }
@@ -6493,7 +5316,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"
           }
@@ -6535,7 +5358,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"
           }
@@ -6544,7 +5367,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 84,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6557,7 +5380,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6576,7 +5399,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6608,7 +5431,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"
           }
@@ -6623,7 +5446,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6655,7 +5478,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"
           }
@@ -6687,7 +5510,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"
           }
@@ -6729,7 +5552,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"
           }
@@ -6771,7 +5594,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"
           }
@@ -6780,7 +5603,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 85,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6793,7 +5616,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6812,7 +5635,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"
           }
@@ -6827,7 +5650,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6859,7 +5682,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"
           }
@@ -6891,7 +5714,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"
           }
@@ -6933,7 +5756,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"
           }
@@ -6975,7 +5798,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"
           }
@@ -6984,7 +5807,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 86,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6997,7 +5820,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7016,7 +5839,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7048,7 +5871,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"
           }
@@ -7063,7 +5886,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7082,7 +5905,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"
           }
@@ -7097,7 +5920,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7129,7 +5952,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"
           }
@@ -7161,7 +5984,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"
           }
@@ -7203,7 +6026,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"
           }
@@ -7245,7 +6068,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"
           }
@@ -7254,7 +6077,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 87,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7267,7 +6090,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7286,7 +6109,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"
           }
@@ -7328,7 +6151,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"
           }
@@ -7370,7 +6193,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"
           }
@@ -7379,7 +6202,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 88,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7392,7 +6215,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7411,7 +6234,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7443,7 +6266,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"
           }
@@ -7458,7 +6281,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7477,7 +6300,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"
           }
@@ -7519,7 +6342,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"
           }
@@ -7561,7 +6384,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"
           }
@@ -7570,7 +6393,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 89,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7583,7 +6406,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7602,7 +6425,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"
           }
@@ -7617,7 +6440,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7636,7 +6459,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"
           }
@@ -7678,7 +6501,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"
           }
@@ -7720,7 +6543,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"
           }
@@ -7729,7 +6552,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 90,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7742,7 +6565,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7761,7 +6584,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7793,7 +6616,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"
           }
@@ -7808,7 +6631,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7827,7 +6650,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"
           }
@@ -7842,7 +6665,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7861,7 +6684,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"
           }
@@ -7903,7 +6726,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"
           }
@@ -7945,7 +6768,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"
           }
@@ -7954,7 +6777,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 91,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7967,7 +6790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7999,7 +6822,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"
           }
@@ -8031,7 +6854,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"
           }
@@ -8046,7 +6869,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8065,7 +6888,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"
           }
@@ -8107,7 +6930,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"
           }
@@ -8149,7 +6972,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"
           }
@@ -8158,7 +6981,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 92,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8171,7 +6994,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8190,7 +7013,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8222,7 +7045,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"
           }
@@ -8237,7 +7060,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8269,7 +7092,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"
           }
@@ -8301,7 +7124,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"
           }
@@ -8316,7 +7139,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8335,7 +7158,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"
           }
@@ -8377,7 +7200,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"
           }
@@ -8419,7 +7242,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"
           }
@@ -8428,7 +7251,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 93,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8441,7 +7264,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8460,7 +7283,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"
           }
@@ -8475,7 +7298,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8507,7 +7330,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"
           }
@@ -8539,7 +7362,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"
           }
@@ -8554,7 +7377,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8573,7 +7396,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"
           }
@@ -8615,7 +7438,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"
           }
@@ -8657,7 +7480,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"
           }
@@ -8666,7 +7489,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 94,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8679,7 +7502,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8698,7 +7521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8730,7 +7553,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"
           }
@@ -8745,7 +7568,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8764,7 +7587,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"
           }
@@ -8779,7 +7602,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8811,7 +7634,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"
           }
@@ -8843,7 +7666,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"
           }
@@ -8858,7 +7681,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8877,7 +7700,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"
           }
@@ -8919,7 +7742,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"
           }
@@ -8961,7 +7784,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"
           }
@@ -8970,13 +7793,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 95,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 96,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8989,7 +7812,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9008,7 +7831,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"
           }
@@ -9050,7 +7873,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"
           }
@@ -9092,7 +7915,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"
           }
@@ -9101,7 +7924,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 97,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9114,7 +7937,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9133,7 +7956,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9152,7 +7975,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9194,7 +8017,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"
           }
@@ -9236,7 +8059,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"
           }
@@ -9245,7 +8068,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 98,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9258,7 +8081,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9277,7 +8100,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"
           }
@@ -9292,7 +8115,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9311,7 +8134,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9330,7 +8153,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9372,7 +8195,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"
           }
@@ -9414,7 +8237,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"
           }
@@ -9423,7 +8246,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 99,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9436,7 +8259,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9478,7 +8301,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"
           }
@@ -9520,7 +8343,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"
           }
@@ -9562,7 +8385,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"
           }
@@ -9571,7 +8394,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 100,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9584,7 +8407,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9603,7 +8426,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"
           }
@@ -9618,7 +8441,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9660,7 +8483,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"
           }
@@ -9702,7 +8525,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"
           }
@@ -9744,7 +8567,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"
           }
@@ -9753,7 +8576,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 101,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9766,7 +8589,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9785,7 +8608,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9804,7 +8627,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9819,7 +8642,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9861,7 +8684,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"
           }
@@ -9903,7 +8726,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"
           }
@@ -9945,7 +8768,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"
           }
@@ -9954,7 +8777,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 102,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9967,7 +8790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9986,7 +8809,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"
           }
@@ -10001,7 +8824,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10020,7 +8843,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10039,7 +8862,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10054,7 +8877,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10096,7 +8919,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"
           }
@@ -10138,7 +8961,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"
           }
@@ -10180,7 +9003,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"
           }
@@ -10189,7 +9012,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 103,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10202,7 +9025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10221,7 +9044,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"
           }
@@ -10263,7 +9086,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"
           }
@@ -10305,7 +9128,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"
           }
@@ -10314,7 +9137,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 104,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10327,7 +9150,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10346,7 +9169,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"
           }
@@ -10361,7 +9184,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10380,7 +9203,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"
           }
@@ -10422,7 +9245,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"
           }
@@ -10464,7 +9287,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"
           }
@@ -10473,7 +9296,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 105,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10486,7 +9309,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10505,7 +9328,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10524,7 +9347,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10539,7 +9362,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10558,7 +9381,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"
           }
@@ -10600,7 +9423,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"
           }
@@ -10642,7 +9465,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"
           }
@@ -10651,7 +9474,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 106,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10664,7 +9487,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10683,7 +9506,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"
           }
@@ -10698,7 +9521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10717,7 +9540,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10736,7 +9559,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10751,7 +9574,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10770,7 +9593,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"
           }
@@ -10812,7 +9635,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"
           }
@@ -10854,7 +9677,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"
           }
@@ -10863,7 +9686,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 107,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10876,7 +9699,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10918,7 +9741,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"
           }
@@ -10933,7 +9756,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10952,7 +9775,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"
           }
@@ -10994,7 +9817,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"
           }
@@ -11036,7 +9859,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"
           }
@@ -11045,7 +9868,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 108,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11058,7 +9881,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11077,7 +9900,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"
           }
@@ -11092,7 +9915,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11134,7 +9957,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"
           }
@@ -11149,7 +9972,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11168,7 +9991,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"
           }
@@ -11210,7 +10033,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"
           }
@@ -11252,7 +10075,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"
           }
@@ -11261,7 +10084,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 109,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11274,7 +10097,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11293,7 +10116,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11312,7 +10135,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11327,7 +10150,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11369,7 +10192,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"
           }
@@ -11384,7 +10207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11403,7 +10226,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"
           }
@@ -11445,7 +10268,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"
           }
@@ -11487,7 +10310,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"
           }
@@ -11496,7 +10319,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 110,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11509,7 +10332,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11528,7 +10351,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"
           }
@@ -11543,7 +10366,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11562,7 +10385,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11581,7 +10404,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11596,7 +10419,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11638,7 +10461,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"
           }
@@ -11653,7 +10476,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11672,7 +10495,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"
           }
@@ -11714,7 +10537,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"
           }
@@ -11756,7 +10579,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"
           }
@@ -11764,68 +10587,302 @@
       ]
     },
     {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 111,
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 93,
       "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" : 112,
-      "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" : 94,
+      "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" : 95,
+      "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" : 96,
+      "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"
           }
         },
         {
@@ -11838,7 +10895,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -11846,8 +10903,25 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 113,
+      "name" : "act_19",
+      "id" : 97,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_20",
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11860,7 +10934,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 57,
+            "line" : 49,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -11879,7 +10953,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"
           }
@@ -11887,8 +10961,25 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 114,
+      "name" : "act_21",
+      "id" : 99,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_22",
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11896,7 +10987,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_23",
+      "id" : 101,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -11917,8 +11038,25 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 115,
+      "name" : "act_24",
+      "id" : 102,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_25",
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11926,7 +11064,152 @@
           "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_26",
+      "id" : 104,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_27",
+      "id" : 105,
+      "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_28",
+      "id" : 106,
+      "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_29",
+      "id" : 107,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -11945,7 +11228,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 376,
+            "line" : 420,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -11953,8 +11236,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 116,
+      "name" : "act_30",
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11994,7 +11277,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"
           }
@@ -12002,8 +11285,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 117,
+      "name" : "act_31",
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12043,7 +11326,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"
           }
@@ -12051,8 +11334,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 118,
+      "name" : "act_32",
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12092,7 +11375,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"
           }
@@ -12100,8 +11383,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 119,
+      "name" : "act_33",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12141,7 +11424,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"
           }
@@ -12155,7 +11438,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -12171,14 +11454,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [34],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 34,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12194,14 +11477,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
+          "action_ids" : [33],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 33,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12217,14 +11500,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [37],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 37,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12240,14 +11523,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
+          "action_ids" : [35],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12263,14 +11546,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
+          "action_ids" : [36],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 36,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12286,14 +11569,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
+          "action_ids" : [38],
           "actions" : ["act_4"],
           "base_default_next" : null,
           "next_tables" : {
             "act_4" : null
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 38,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12309,14 +11592,158 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_13",
+          "action_ids" : [39],
+          "actions" : ["act_5"],
+          "base_default_next" : "node_14",
           "next_tables" : {
-            "act_12" : "node_13"
+            "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 39,
+            "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" : [40],
+          "actions" : ["act_6"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 40,
+            "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" : [13, 14, 15],
+          "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" : 13,
+            "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" : [16],
+          "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" : 16,
+            "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" : [49],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "act_15" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12324,17 +11751,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
             }
@@ -12346,22 +11773,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",
@@ -12369,22 +11796,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_17",
+          "action_ids" : [41],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_5" : "node_17"
+            "act_7" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 9,
+          "name" : "tbl_act_9",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12392,22 +11819,68 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_17",
+          "action_ids" : [42],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_17"
+            "act_8" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 10,
+          "name" : "tbl_act_10",
+          "id" : 14,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [43],
+          "actions" : ["act_9"],
+          "base_default_next" : "tbl_act_11",
+          "next_tables" : {
+            "act_9" : "tbl_act_11"
+          },
+          "default_entry" : {
+            "action_id" : 43,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "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" : [44],
+          "actions" : ["act_10"],
+          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
+          "next_tables" : {
+            "act_10" : "tbl_spgw_ingress_gtpu_decap"
+          },
+          "default_entry" : {
+            "action_id" : 44,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_ingress_gtpu_decap",
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12416,10 +11889,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [10],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_8",
+          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "drop_now" : "tbl_act_8"
+            "FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
           },
           "default_entry" : {
             "action_id" : 10,
@@ -12429,64 +11902,18 @@
           }
         },
         {
-          "name" : "tbl_act_8",
-          "id" : 11,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_7"],
-          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
-          "next_tables" : {
-            "act_7" : "tbl_spgw_ingress_gtpu_decap"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_ingress_gtpu_decap",
-          "id" : 12,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [11],
-          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 11,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "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
             }
@@ -12497,84 +11924,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12, 0],
-          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
+          "action_ids" : [11, 0],
+          "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" : [48],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_8" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 48,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 15,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_9" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 49,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 16,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_10" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12582,29 +11940,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" : [51],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_11" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 51,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
           "id" : 18,
           "key" : [],
           "match_type" : "exact",
@@ -12613,65 +11948,39 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_13"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "action_ids" : [45],
+          "actions" : ["act_11"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "act_13" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_11" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "name" : "tbl_act_13",
           "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",
+          "key" : [],
+          "match_type" : "exact",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : true,
+          "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 15, 14, 17],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
+          "action_ids" : [46],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "__HIT__" : "tbl_act_14",
-            "__MISS__" : "tbl_act_15"
+            "act_12" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 16,
+            "action_id" : 46,
             "action_const" : true,
-            "action_data" : ["0xffe"],
+            "action_data" : [],
             "action_entry_const" : true
           }
         },
@@ -12685,14 +11994,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_32",
+          "action_ids" : [47],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_14" : "node_32"
+            "act_13" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12708,70 +12017,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_32",
+          "action_ids" : [48],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_15" : "node_32"
+            "act_14" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 48,
             "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" : [18],
-          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 18,
-            "action_const" : true,
-            "action_data" : ["0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_16",
-          "id" : 23,
+          "id" : 22,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12779,14 +12040,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
+          "action_ids" : [50],
           "actions" : ["act_16"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "act_16" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12794,23 +12055,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
             }
@@ -12821,34 +12082,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 3],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [17, 3],
+          "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" : 3,
-            "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
             }
           ],
@@ -12858,38 +12119,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [20, 4],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_17",
+          "action_ids" : [18, 4],
+          "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" : 4,
-            "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" : [57],
-          "actions" : ["act_17"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_17" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12897,17 +12135,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
             }
@@ -12918,100 +12156,100 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 22, 5],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [19, 20, 5],
+          "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" : 5,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 28,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 26,
           "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
             }
@@ -13022,26 +12260,178 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 24, 25, 26, 27],
-          "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",
+          "action_ids" : [21, 22, 23, 24, 25],
+          "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_43",
           "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_43",
+            "FabricIngress.acl.punt_to_cpu" : "node_43",
+            "FabricIngress.acl.clone_to_cpu" : "node_43",
+            "FabricIngress.acl.drop" : "node_43",
+            "FabricIngress.acl.nop_acl" : "node_43"
           },
           "default_entry" : {
-            "action_id" : 27,
+            "action_id" : 25,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 27,
+          "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" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [27, 28, 7],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.hashed",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 7,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 28,
+          "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" : [29, 30, 31, 8],
+          "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" : 29,
+          "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" : [32, 9],
+          "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" : 9,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 30,
+          "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" : [26, 6],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_48",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_48",
+            "nop" : "node_48"
+          },
+          "default_entry" : {
+            "action_id" : 6,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 31,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13049,95 +12439,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_18"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [51],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "act_18" : "FabricIngress.next.vlan_meta"
+            "act_17" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 30,
-          "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" : [28, 9],
-          "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" : 9,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.next.simple",
-          "id" : 31,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 122,
-            "column" : 10,
-            "source_fragment" : "simple"
-          },
-          "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" : [29, 30, 31, 32, 33, 34, 6],
-          "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,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_19",
-            "__MISS__" : "tbl_act_20"
-          },
-          "default_entry" : {
-            "action_id" : 6,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_19",
+          "name" : "tbl_act_18",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -13146,290 +12462,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_48",
-          "next_tables" : {
-            "act_19" : "node_48"
-          },
-          "default_entry" : {
-            "action_id" : 59,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 33,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [60],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_48",
-          "next_tables" : {
-            "act_20" : "node_48"
-          },
-          "default_entry" : {
-            "action_id" : 60,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 34,
-          "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" : [35, 36, 37, 7],
-          "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" : 35,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_52",
-          "next_tables" : {
-            "act_21" : "node_52"
-          },
-          "default_entry" : {
-            "action_id" : 61,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_22",
-          "id" : 36,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_52",
-          "next_tables" : {
-            "act_22" : "node_52"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 37,
-          "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" : [38, 8],
-          "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" : 8,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_23",
-          "id" : 38,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_56",
-          "next_tables" : {
-            "act_23" : "node_56"
-          },
-          "default_entry" : {
-            "action_id" : 63,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_24",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_56",
-          "next_tables" : {
-            "act_24" : "node_56"
-          },
-          "default_entry" : {
-            "action_id" : 64,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_25",
-          "id" : 40,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_58",
-          "next_tables" : {
-            "act_25" : "node_58"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_26",
-          "id" : 41,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_62",
-          "next_tables" : {
-            "act_26" : "node_62"
-          },
-          "default_entry" : {
-            "action_id" : 66,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_27",
-          "id" : 42,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_64",
-          "next_tables" : {
-            "act_27" : "node_64"
-          },
-          "default_entry" : {
-            "action_id" : 67,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_28",
-          "id" : 43,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_28"],
+          "action_ids" : [52],
+          "actions" : ["act_18"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_28" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_18" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13437,7 +12477,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 44,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -13447,7 +12487,7 @@
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             }
@@ -13458,30 +12498,30 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 2],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
+          "action_ids" : [12, 2],
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricIngress.process_set_source_sink.int_set_source" : null,
-            "NoAction" : null
+            "nop" : null
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         }
       ],
       "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" : {
@@ -13501,11 +12541,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"]
               }
             ]
           }
@@ -13557,7 +12597,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+                    "value" : ["scalars", "spgw_normalizer_hasReturned"]
                   }
                 }
               }
@@ -13594,7 +12634,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -13610,14 +12650,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()"
           },
@@ -13636,11 +12729,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"
           },
@@ -13656,18 +12749,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" : {
@@ -13675,16 +12768,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" : {
@@ -13697,39 +12790,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" : {
@@ -13747,14 +12856,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"
           },
@@ -13777,10 +12886,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"
           },
@@ -13799,181 +12908,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_43",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 70,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
           "name" : "node_48",
-          "id" : 12,
-          "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_58"
-        },
-        {
-          "name" : "node_52",
-          "id" : 13,
-          "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_58"
-        },
-        {
-          "name" : "node_56",
-          "id" : 14,
-          "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_58"
-        },
-        {
-          "name" : "node_58",
           "id" : 15,
-          "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_59",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_59",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
-            "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" : "node_60",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_60",
-          "id" : 17,
-          "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$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_62",
-          "id" : 18,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -13991,15 +12966,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_64"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_64",
-          "id" : 19,
+          "name" : "node_50",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -14017,7 +12992,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
+          "true_next" : "tbl_act_18",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -14027,15 +13002,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_69",
+      "init_table" : "node_55",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 45,
+          "name" : "tbl_act_19",
+          "id" : 34,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14043,22 +13018,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_73",
+          "action_ids" : [97],
+          "actions" : ["act_19"],
+          "base_default_next" : "tbl_act_20",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_73"
+            "act_19" : "tbl_act_20"
           },
           "default_entry" : {
-            "action_id" : 111,
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 46,
+          "name" : "tbl_act_20",
+          "id" : 35,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14066,45 +13041,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_29",
-          "next_tables" : {
-            "drop_now" : "tbl_act_29"
-          },
-          "default_entry" : {
-            "action_id" : 74,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_29",
-          "id" : 47,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [113],
-          "actions" : ["act_29"],
+          "action_ids" : [98],
+          "actions" : ["act_20"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_29" : null
+            "act_20" : null
           },
           "default_entry" : {
-            "action_id" : 113,
+            "action_id" : 98,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_1",
-          "id" : 48,
+          "name" : "tbl_act_21",
+          "id" : 36,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14112,14 +13064,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [99],
+          "actions" : ["act_21"],
+          "base_default_next" : "node_62",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_21" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 75,
+            "action_id" : 99,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 37,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [93],
+          "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" : 93,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 38,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [94],
+          "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" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14127,23 +13125,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 49,
+          "id" : 39,
           "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
             }
@@ -14154,23 +13152,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112, 73],
+          "action_ids" : [96, 55],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_79",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_79",
-            "nop" : "node_79"
+            "__HIT__" : "tbl_act_22",
+            "__MISS__" : "tbl_act_23"
           },
           "default_entry" : {
-            "action_id" : 73,
-            "action_const" : false,
+            "action_id" : 55,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 50,
+          "name" : "tbl_act_22",
+          "id" : 40,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14178,14 +13176,175 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_81",
+          "action_ids" : [100],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_81"
+            "act_22" : "node_69"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 100,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_23",
+          "id" : 41,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [101],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_69",
+          "next_tables" : {
+            "act_23" : "node_69"
+          },
+          "default_entry" : {
+            "action_id" : 101,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 42,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [95],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_72",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_72"
+          },
+          "default_entry" : {
+            "action_id" : 95,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_24",
+          "id" : 43,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [103],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_74",
+          "next_tables" : {
+            "act_25" : "node_74"
+          },
+          "default_entry" : {
+            "action_id" : 103,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_25",
+          "id" : 44,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [102],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_80",
+          "next_tables" : {
+            "act_24" : "node_80"
+          },
+          "default_entry" : {
+            "action_id" : 102,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_26",
+          "id" : 45,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [105],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_78",
+          "next_tables" : {
+            "act_27" : "node_78"
+          },
+          "default_entry" : {
+            "action_id" : 105,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_27",
+          "id" : 46,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [104],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_80",
+          "next_tables" : {
+            "act_26" : "node_80"
+          },
+          "default_entry" : {
+            "action_id" : 104,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_egress_gtpu_encap",
+          "id" : 47,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [58],
+          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
+          "base_default_next" : "node_82",
+          "next_tables" : {
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_82"
+          },
+          "default_entry" : {
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14193,36 +13352,36 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 51,
+          "id" : 48,
           "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
             }
           ],
@@ -14232,23 +13391,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77, 69],
-          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_84",
+          "action_ids" : [59, 53],
+          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
+          "base_default_next" : "node_85",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_84",
-            "NoAction" : "node_84"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_85",
+            "nop" : "node_85"
           },
           "default_entry" : {
-            "action_id" : 69,
-            "action_const" : false,
+            "action_id" : 53,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 52,
+          "name" : "tbl_act_28",
+          "id" : 49,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14256,14 +13415,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [114],
-          "actions" : ["act_30"],
+          "action_ids" : [106],
+          "actions" : ["act_28"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_30" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_28" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 114,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14271,17 +13430,17 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 53,
+          "id" : 50,
           "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
             }
@@ -14292,23 +13451,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [78, 72],
+          "action_ids" : [60, 54],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_87",
+          "base_default_next" : "node_88",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_87",
-            "nop" : "node_87"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_88",
+            "nop" : "node_88"
           },
           "default_entry" : {
-            "action_id" : 72,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 54,
+          "name" : "tbl_act_29",
+          "id" : 51,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14316,14 +13475,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [115],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_89",
+          "action_ids" : [107],
+          "actions" : ["act_29"],
+          "base_default_next" : "node_90",
           "next_tables" : {
-            "act_31" : "node_89"
+            "act_29" : "node_90"
           },
           "default_entry" : {
-            "action_id" : 115,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14331,10 +13490,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 55,
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 286,
+            "line" : 331,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0003"
           },
@@ -14352,7 +13511,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 70],
+          "action_ids" : [61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 56],
           "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" : {
@@ -14375,7 +13534,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 70,
+            "action_id" : 56,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -14384,7 +13543,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 310,
+                "line" : 354,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0003_i0()"
               },
@@ -14395,7 +13554,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 61,
                 "action_data" : []
               },
               "priority" : 1
@@ -14403,7 +13562,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 311,
+                "line" : 355,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0003_i1()"
               },
@@ -14414,7 +13573,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 2
@@ -14422,7 +13581,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 312,
+                "line" : 356,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0003_i2()"
               },
@@ -14433,7 +13592,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 3
@@ -14441,7 +13600,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 313,
+                "line" : 357,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0003_i3()"
               },
@@ -14452,7 +13611,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 4
@@ -14460,7 +13619,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 314,
+                "line" : 358,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0003_i4()"
               },
@@ -14471,7 +13630,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 5
@@ -14479,7 +13638,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 315,
+                "line" : 359,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0003_i5()"
               },
@@ -14490,7 +13649,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 6
@@ -14498,7 +13657,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 316,
+                "line" : 360,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0003_i6()"
               },
@@ -14509,7 +13668,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 7
@@ -14517,7 +13676,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 317,
+                "line" : 361,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0003_i7()"
               },
@@ -14528,7 +13687,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 8
@@ -14536,7 +13695,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 318,
+                "line" : 362,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0003_i8()"
               },
@@ -14547,7 +13706,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 9
@@ -14555,7 +13714,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 319,
+                "line" : 363,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0003_i9()"
               },
@@ -14566,7 +13725,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 10
@@ -14574,7 +13733,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 320,
+                "line" : 364,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0003_i10()"
               },
@@ -14585,7 +13744,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 11
@@ -14593,7 +13752,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 321,
+                "line" : 365,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0003_i11()"
               },
@@ -14604,7 +13763,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 12
@@ -14612,7 +13771,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 322,
+                "line" : 366,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0003_i12()"
               },
@@ -14623,7 +13782,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 13
@@ -14631,7 +13790,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 323,
+                "line" : 367,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0003_i13()"
               },
@@ -14642,7 +13801,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 14
@@ -14650,7 +13809,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 324,
+                "line" : 368,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0003_i14()"
               },
@@ -14661,7 +13820,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 93,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 15
@@ -14669,7 +13828,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 325,
+                "line" : 369,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0003_i15()"
               },
@@ -14680,7 +13839,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 94,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 16
@@ -14689,10 +13848,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 56,
+          "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 330,
+            "line" : 375,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0407"
           },
@@ -14710,30 +13869,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 71],
+          "action_ids" : [77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 57],
           "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_32",
+          "base_default_next" : "tbl_act_30",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_32",
-            "NoAction" : "tbl_act_32"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_30",
+            "NoAction" : "tbl_act_30"
           },
           "default_entry" : {
-            "action_id" : 71,
+            "action_id" : 57,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -14742,7 +13901,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 354,
+                "line" : 398,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0407_i0()"
               },
@@ -14753,7 +13912,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 95,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 1
@@ -14761,7 +13920,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 355,
+                "line" : 399,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0407_i1()"
               },
@@ -14772,7 +13931,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 2
@@ -14780,7 +13939,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 356,
+                "line" : 400,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0407_i2()"
               },
@@ -14791,7 +13950,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 3
@@ -14799,7 +13958,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 357,
+                "line" : 401,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0407_i3()"
               },
@@ -14810,7 +13969,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 4
@@ -14818,7 +13977,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 358,
+                "line" : 402,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0407_i4()"
               },
@@ -14829,7 +13988,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 5
@@ -14837,7 +13996,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 359,
+                "line" : 403,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0407_i5()"
               },
@@ -14848,7 +14007,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 6
@@ -14856,7 +14015,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 360,
+                "line" : 404,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0407_i6()"
               },
@@ -14867,7 +14026,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 7
@@ -14875,7 +14034,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 361,
+                "line" : 405,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0407_i7()"
               },
@@ -14886,7 +14045,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 8
@@ -14894,7 +14053,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 362,
+                "line" : 406,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0407_i8()"
               },
@@ -14905,7 +14064,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 103,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 9
@@ -14913,7 +14072,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 363,
+                "line" : 407,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0407_i9()"
               },
@@ -14924,7 +14083,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 10
@@ -14932,7 +14091,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 364,
+                "line" : 408,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0407_i10()"
               },
@@ -14943,7 +14102,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 11
@@ -14951,7 +14110,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 365,
+                "line" : 409,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0407_i11()"
               },
@@ -14962,7 +14121,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 12
@@ -14970,7 +14129,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 366,
+                "line" : 410,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0407_i12()"
               },
@@ -14981,7 +14140,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 13
@@ -14989,7 +14148,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 367,
+                "line" : 411,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0407_i13()"
               },
@@ -15000,7 +14159,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 14
@@ -15008,7 +14167,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 368,
+                "line" : 412,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0407_i14()"
               },
@@ -15019,7 +14178,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 15
@@ -15027,7 +14186,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 369,
+                "line" : 413,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0407_i15()"
               },
@@ -15038,7 +14197,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 16
@@ -15046,7 +14205,76 @@
           ]
         },
         {
+          "name" : "tbl_act_30",
+          "id" : 54,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [109],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_94",
+          "next_tables" : {
+            "act_31" : "node_94"
+          },
+          "default_entry" : {
+            "action_id" : 109,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_31",
+          "id" : 55,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [108],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_96",
+          "next_tables" : {
+            "act_30" : "node_96"
+          },
+          "default_entry" : {
+            "action_id" : 108,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_32",
+          "id" : 56,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [110],
+          "actions" : ["act_32"],
+          "base_default_next" : "node_98",
+          "next_tables" : {
+            "act_32" : "node_98"
+          },
+          "default_entry" : {
+            "action_id" : 110,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_33",
           "id" : 57,
           "key" : [],
           "match_type" : "exact",
@@ -15055,83 +14283,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [117],
+          "action_ids" : [111],
           "actions" : ["act_33"],
-          "base_default_next" : "node_93",
-          "next_tables" : {
-            "act_33" : "node_93"
-          },
-          "default_entry" : {
-            "action_id" : 117,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_33",
-          "id" : 58,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [116],
-          "actions" : ["act_32"],
-          "base_default_next" : "node_95",
-          "next_tables" : {
-            "act_32" : "node_95"
-          },
-          "default_entry" : {
-            "action_id" : 116,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_34",
-          "id" : 59,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [118],
-          "actions" : ["act_34"],
-          "base_default_next" : "node_97",
-          "next_tables" : {
-            "act_34" : "node_97"
-          },
-          "default_entry" : {
-            "action_id" : 118,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_35",
-          "id" : 60,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [119],
-          "actions" : ["act_35"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_35" : null
+            "act_33" : null
           },
           "default_entry" : {
-            "action_id" : 119,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15141,11 +14300,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_69",
-          "id" : 20,
+          "name" : "node_55",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -15171,14 +14330,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_70"
+          "false_next" : "node_56"
         },
         {
-          "name" : "node_70",
-          "id" : 21,
+          "name" : "node_56",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -15196,65 +14355,15 @@
               }
             }
           },
-          "true_next" : "node_71",
-          "false_next" : "node_76"
+          "true_next" : "node_57",
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_71",
-          "id" : 22,
+          "name" : "node_57",
+          "id" : 19,
           "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_73"
-        },
-        {
-          "name" : "node_73",
-          "id" : 23,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -15306,15 +14415,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
-          "false_next" : "tbl_act_29"
+          "true_next" : "tbl_act_19",
+          "false_next" : "tbl_act_20"
         },
         {
-          "name" : "node_76",
-          "id" : 24,
+          "name" : "node_60",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -15359,17 +14468,220 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_1",
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_62"
+        },
+        {
+          "name" : "node_62",
+          "id" : 21,
+          "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_63",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_63",
+          "id" : 22,
+          "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_79",
+          "name" : "node_69",
+          "id" : 23,
+          "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_70",
+          "false_next" : "node_72"
+        },
+        {
+          "name" : "node_70",
+          "id" : 24,
+          "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_72"
+        },
+        {
+          "name" : "node_72",
           "id" : 25,
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 221,
+            "filename" : "include/control/next.p4",
+            "line" : 318,
             "column" : 12,
-            "source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK"
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_76"
+        },
+        {
+          "name" : "node_74",
+          "id" : 26,
+          "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_25",
+          "false_next" : "node_80"
+        },
+        {
+          "name" : "node_76",
+          "id" : 27,
+          "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_26",
+          "false_next" : "node_80"
+        },
+        {
+          "name" : "node_78",
+          "id" : 28,
+          "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_27",
+          "false_next" : "node_80"
+        },
+        {
+          "name" : "node_80",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 226,
+            "column" : 12,
+            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
           },
           "expression" : {
             "type" : "expression",
@@ -15386,14 +14698,14 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_81"
+          "false_next" : "node_82"
         },
         {
-          "name" : "node_81",
-          "id" : 26,
+          "name" : "node_82",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 98,
+            "line" : 102,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port != 255 && ..."
           },
@@ -15466,14 +14778,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_82"
+          "true_next" : "node_83"
         },
         {
-          "name" : "node_82",
-          "id" : 27,
+          "name" : "node_83",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 102,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "fabric_metadata.int_meta.source == true"
           },
@@ -15499,14 +14811,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_84"
+          "false_next" : "node_85"
         },
         {
-          "name" : "node_84",
-          "id" : 28,
+          "name" : "node_85",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 106,
+            "line" : 110,
             "column" : 15,
             "source_fragment" : "hdr.int_header.isValid()"
           },
@@ -15522,14 +14834,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_30"
+          "true_next" : "tbl_act_28"
         },
         {
-          "name" : "node_87",
-          "id" : 29,
+          "name" : "node_88",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 375,
+            "line" : 419,
             "column" : 12,
             "source_fragment" : "fmeta.int_meta.transit == false"
           },
@@ -15554,12 +14866,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_31",
-          "false_next" : "node_89"
+          "true_next" : "tbl_act_29",
+          "false_next" : "node_90"
         },
         {
-          "name" : "node_89",
-          "id" : 30,
+          "name" : "node_90",
+          "id" : 34,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15572,7 +14884,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
                   }
                 }
               }
@@ -15582,11 +14894,11 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_93",
-          "id" : 31,
+          "name" : "node_94",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 383,
+            "line" : 427,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -15601,15 +14913,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_95"
+          "true_next" : "tbl_act_31",
+          "false_next" : "node_96"
         },
         {
-          "name" : "node_95",
-          "id" : 32,
+          "name" : "node_96",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 386,
+            "line" : 430,
             "column" : 12,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -15624,15 +14936,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_34",
-          "false_next" : "node_97"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_98"
         },
         {
-          "name" : "node_97",
-          "id" : 33,
+          "name" : "node_98",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 389,
+            "line" : 433,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.isValid()"
           },
@@ -15648,7 +14960,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_35"
+          "true_next" : "tbl_act_33"
         }
       ]
     }
@@ -15683,7 +14995,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },