diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 5a7432d..83da36b 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -5,11 +5,13 @@
       "id" : 0,
       "fields" : [
         ["last_ipv4_dscp_0", 6, false],
-        ["tmp_0", 4, false],
+        ["tmp_2", 16, false],
+        ["tmp_3", 16, false],
+        ["tmp_4", 4, false],
         ["tmp", 8, false],
+        ["tmp_0", 32, false],
         ["tmp_1", 32, false],
-        ["tmp_2", 32, false],
-        ["tmp_3", 32, false],
+        ["tmp_5", 32, false],
         ["spgw_ingress_tmp", 1, false],
         ["spgw_ingress_tmp_0", 1, false],
         ["bng_ingress_s_tag", 12, false],
@@ -22,47 +24,43 @@
         ["key_0", 64, false],
         ["egress_next_tmp", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
-        ["fabric_metadata_t._last_eth_type0", 16, false],
-        ["fabric_metadata_t._is_ipv41", 1, false],
-        ["fabric_metadata_t._is_ipv62", 1, false],
-        ["fabric_metadata_t._is_mpls3", 1, false],
-        ["fabric_metadata_t._ip_eth_type4", 16, false],
-        ["fabric_metadata_t._vlan_id5", 12, false],
-        ["fabric_metadata_t._vlan_pri6", 3, false],
-        ["fabric_metadata_t._vlan_cfi7", 1, false],
-        ["fabric_metadata_t._push_double_vlan8", 1, false],
-        ["fabric_metadata_t._inner_vlan_id9", 12, false],
-        ["fabric_metadata_t._inner_vlan_pri10", 3, false],
-        ["fabric_metadata_t._inner_vlan_cfi11", 1, false],
-        ["fabric_metadata_t._mpls_label12", 20, false],
-        ["fabric_metadata_t._mpls_ttl13", 8, false],
-        ["fabric_metadata_t._skip_forwarding14", 1, false],
-        ["fabric_metadata_t._skip_next15", 1, false],
-        ["fabric_metadata_t._fwd_type16", 3, false],
-        ["fabric_metadata_t._next_id17", 32, false],
-        ["fabric_metadata_t._is_multicast18", 1, false],
-        ["fabric_metadata_t._is_controller_packet_out19", 1, false],
-        ["fabric_metadata_t._ip_proto20", 8, false],
-        ["fabric_metadata_t._l4_sport21", 16, false],
-        ["fabric_metadata_t._l4_dport22", 16, false],
-        ["fabric_metadata_t._spgw_direction23", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len24", 16, false],
-        ["fabric_metadata_t._spgw_teid25", 32, false],
-        ["fabric_metadata_t._spgw_s1u_enb_addr26", 32, false],
-        ["fabric_metadata_t._spgw_s1u_sgw_addr27", 32, false],
-        ["fabric_metadata_t._bng_type28", 2, false],
-        ["fabric_metadata_t._bng_line_id29", 32, false],
-        ["fabric_metadata_t._bng_pppoe_session_id30", 16, false],
-        ["fabric_metadata_t._bng_ds_meter_result31", 32, false],
-        ["fabric_metadata_t._int_meta_source32", 1, false],
-        ["fabric_metadata_t._int_meta_transit33", 1, false],
-        ["fabric_metadata_t._int_meta_sink34", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id35", 32, false],
-        ["fabric_metadata_t._int_meta_new_words36", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes37", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp38", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp39", 32, false],
-        ["_padding_0", 7, false]
+        ["fabric_metadata_t._ip_eth_type0", 16, false],
+        ["fabric_metadata_t._vlan_id1", 12, false],
+        ["fabric_metadata_t._vlan_pri2", 3, false],
+        ["fabric_metadata_t._vlan_cfi3", 1, false],
+        ["fabric_metadata_t._push_double_vlan4", 1, false],
+        ["fabric_metadata_t._inner_vlan_id5", 12, false],
+        ["fabric_metadata_t._inner_vlan_pri6", 3, false],
+        ["fabric_metadata_t._inner_vlan_cfi7", 1, false],
+        ["fabric_metadata_t._mpls_label8", 20, false],
+        ["fabric_metadata_t._mpls_ttl9", 8, false],
+        ["fabric_metadata_t._skip_forwarding10", 1, false],
+        ["fabric_metadata_t._skip_next11", 1, false],
+        ["fabric_metadata_t._fwd_type12", 3, false],
+        ["fabric_metadata_t._next_id13", 32, false],
+        ["fabric_metadata_t._is_multicast14", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out15", 1, false],
+        ["fabric_metadata_t._ip_proto16", 8, false],
+        ["fabric_metadata_t._l4_sport17", 16, false],
+        ["fabric_metadata_t._l4_dport18", 16, false],
+        ["fabric_metadata_t._spgw_direction19", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len20", 16, false],
+        ["fabric_metadata_t._spgw_teid21", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr22", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr23", 32, false],
+        ["fabric_metadata_t._bng_type24", 2, false],
+        ["fabric_metadata_t._bng_line_id25", 32, false],
+        ["fabric_metadata_t._bng_pppoe_session_id26", 16, false],
+        ["fabric_metadata_t._bng_ds_meter_result27", 32, false],
+        ["fabric_metadata_t._int_meta_source28", 1, false],
+        ["fabric_metadata_t._int_meta_transit29", 1, false],
+        ["fabric_metadata_t._int_meta_sink30", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id31", 32, false],
+        ["fabric_metadata_t._int_meta_new_words32", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes33", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp34", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp35", 32, false],
+        ["_padding_0", 2, false]
       ]
     },
     {
@@ -99,23 +97,29 @@
       "id" : 2,
       "fields" : [
         ["dst_addr", 48, false],
-        ["src_addr", 48, false],
-        ["eth_type", 16, false]
+        ["src_addr", 48, false]
       ]
     },
     {
       "name" : "vlan_tag_t",
       "id" : 3,
       "fields" : [
+        ["eth_type", 16, false],
         ["pri", 3, false],
         ["cfi", 1, false],
-        ["vlan_id", 12, false],
-        ["eth_type", 16, false]
+        ["vlan_id", 12, false]
+      ]
+    },
+    {
+      "name" : "eth_type_t",
+      "id" : 4,
+      "fields" : [
+        ["value", 16, false]
       ]
     },
     {
       "name" : "pppoe_t",
-      "id" : 4,
+      "id" : 5,
       "fields" : [
         ["version", 4, false],
         ["type_id", 4, false],
@@ -127,7 +131,7 @@
     },
     {
       "name" : "mpls_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
@@ -137,7 +141,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -156,7 +160,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -166,7 +170,7 @@
     },
     {
       "name" : "gtpu_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["version", 3, false],
         ["pt", 1, false],
@@ -181,7 +185,7 @@
     },
     {
       "name" : "ipv6_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["version", 4, false],
         ["traffic_class", 8, false],
@@ -195,7 +199,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 10,
+      "id" : 11,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -212,7 +216,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 11,
+      "id" : 12,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -224,7 +228,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 12,
+      "id" : 13,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -232,7 +236,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 13,
+      "id" : 14,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -240,7 +244,7 @@
     },
     {
       "name" : "report_fixed_header_t",
-      "id" : 14,
+      "id" : 15,
       "fields" : [
         ["ver", 4, false],
         ["nproto", 4, false],
@@ -255,7 +259,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 15,
+      "id" : 16,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -265,7 +269,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 16,
+      "id" : 17,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -284,14 +288,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 17,
+      "id" : 18,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 18,
+      "id" : 19,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -299,14 +303,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 19,
+      "id" : 20,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 20,
+      "id" : 21,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -314,21 +318,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 21,
+      "id" : 22,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 22,
+      "id" : 23,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 23,
+      "id" : 24,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -336,14 +340,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 24,
+      "id" : 25,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "int_data_t",
-      "id" : 25,
+      "id" : 26,
       "fields" : [
         ["data", "*"]
       ],
@@ -351,7 +355,7 @@
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 26,
+      "id" : 27,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -397,211 +401,225 @@
       "pi_omit" : true
     },
     {
-      "name" : "pppoe",
+      "name" : "eth_type",
       "id" : 5,
+      "header_type" : "eth_type_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "pppoe",
+      "id" : 6,
       "header_type" : "pppoe_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "mpls",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_ipv4",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 11,
+      "id" : 12,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv6",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "ipv6_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 14,
+      "id" : 15,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 15,
+      "id" : 16,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 16,
+      "id" : 17,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 17,
+      "id" : 18,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 18,
+      "id" : 19,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ethernet",
-      "id" : 19,
+      "id" : 20,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
+      "name" : "report_eth_type",
+      "id" : 21,
+      "header_type" : "eth_type_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
       "name" : "report_ipv4",
-      "id" : 20,
+      "id" : 22,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_udp",
-      "id" : 21,
+      "id" : 23,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_fixed_header",
-      "id" : 22,
+      "id" : 24,
       "header_type" : "report_fixed_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_shim",
-      "id" : 23,
+      "id" : 25,
       "header_type" : "intl4_shim_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_header",
-      "id" : 24,
+      "id" : 26,
       "header_type" : "int_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_switch_id",
-      "id" : 25,
+      "id" : 27,
       "header_type" : "int_switch_id_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_port_ids",
-      "id" : 26,
+      "id" : 28,
       "header_type" : "int_port_ids_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_hop_latency",
-      "id" : 27,
+      "id" : 29,
       "header_type" : "int_hop_latency_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_occupancy",
-      "id" : 28,
+      "id" : 30,
       "header_type" : "int_q_occupancy_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_ingress_tstamp",
-      "id" : 29,
+      "id" : 31,
       "header_type" : "int_ingress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tstamp",
-      "id" : 30,
+      "id" : 32,
       "header_type" : "int_egress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_congestion",
-      "id" : 31,
+      "id" : 33,
       "header_type" : "int_q_congestion_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tx_util",
-      "id" : 32,
+      "id" : 34,
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_data",
-      "id" : 33,
+      "id" : 35,
       "header_type" : "int_data_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_tail",
-      "id" : 34,
+      "id" : 36,
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
@@ -728,11 +746,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
                 },
                 {
-                  "type" : "field",
-                  "value" : ["ethernet", "eth_type"]
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
                 }
               ],
               "op" : "set"
@@ -741,11 +759,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+                  "value" : ["scalars", "tmp_2"]
                 },
                 {
-                  "type" : "hexstr",
-                  "value" : "0x0ffe"
+                  "type" : "lookahead",
+                  "value" : [0, 16]
                 }
               ],
               "op" : "set"
@@ -771,33 +789,15 @@
               "next_state" : "parse_vlan_tag"
             },
             {
-              "type" : "hexstr",
-              "value" : "0x8847",
-              "mask" : null,
-              "next_state" : "parse_mpls"
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800",
-              "mask" : null,
-              "next_state" : "pre_parse_ipv4"
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x86dd",
-              "mask" : null,
-              "next_state" : "pre_parse_ipv6"
-            },
-            {
               "value" : "default",
               "mask" : null,
-              "next_state" : null
+              "next_state" : "parse_eth_type"
             }
           ],
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "eth_type"]
+              "value" : ["scalars", "tmp_2"]
             }
           ]
         },
@@ -813,29 +813,24 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_3"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 16]
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0800",
-              "mask" : null,
-              "next_state" : "pre_parse_ipv4"
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x86dd",
-              "mask" : null,
-              "next_state" : "pre_parse_ipv6"
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847",
-              "mask" : null,
-              "next_state" : "parse_mpls"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x8100",
               "mask" : null,
               "next_state" : "parse_inner_vlan_tag"
@@ -843,13 +838,13 @@
             {
               "value" : "default",
               "mask" : null,
-              "next_state" : null
+              "next_state" : "parse_eth_type"
             }
           ],
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "eth_type"]
+              "value" : ["scalars", "tmp_3"]
             }
           ]
         },
@@ -869,17 +864,28 @@
           ],
           "transitions" : [
             {
-              "type" : "hexstr",
-              "value" : "0x0800",
+              "value" : "default",
               "mask" : null,
-              "next_state" : "pre_parse_ipv4"
-            },
+              "next_state" : "parse_eth_type"
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "parse_eth_type",
+          "id" : 5,
+          "parser_ops" : [
             {
-              "type" : "hexstr",
-              "value" : "0x86dd",
-              "mask" : null,
-              "next_state" : "pre_parse_ipv6"
-            },
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "eth_type"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
             {
               "type" : "hexstr",
               "value" : "0x8847",
@@ -888,6 +894,18 @@
             },
             {
               "type" : "hexstr",
+              "value" : "0x0800",
+              "mask" : null,
+              "next_state" : "parse_ipv4"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x86dd",
+              "mask" : null,
+              "next_state" : "parse_ipv6"
+            },
+            {
+              "type" : "hexstr",
               "value" : "0x8863",
               "mask" : null,
               "next_state" : "parse_pppoe"
@@ -907,13 +925,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["inner_vlan_tag", "eth_type"]
+              "value" : ["eth_type", "value"]
             }
           ]
         },
         {
           "name" : "parse_pppoe",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -936,13 +954,13 @@
               "type" : "hexstr",
               "value" : "0x0021",
               "mask" : null,
-              "next_state" : "pre_parse_ipv4"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
               "value" : "0x0057",
               "mask" : null,
-              "next_state" : "pre_parse_ipv6"
+              "next_state" : "parse_ipv6"
             },
             {
               "value" : "default",
@@ -959,7 +977,7 @@
         },
         {
           "name" : "parse_mpls",
-          "id" : 6,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -974,30 +992,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._is_mpls3"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "b2d",
-                      "left" : null,
-                      "right" : {
-                        "type" : "bool",
-                        "value" : true
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            },
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_label12"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
                 },
                 {
                   "type" : "field",
@@ -1010,7 +1005,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl13"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
                 },
                 {
                   "type" : "field",
@@ -1023,7 +1018,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp_4"]
                 },
                 {
                   "type" : "lookahead",
@@ -1055,48 +1050,11 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp_4"]
             }
           ]
         },
         {
-          "name" : "pre_parse_ipv4",
-          "id" : 7,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._is_ipv41"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "b2d",
-                      "left" : null,
-                      "right" : {
-                        "type" : "bool",
-                        "value" : true
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : "parse_ipv4"
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_ipv4",
           "id" : 8,
           "parser_ops" : [
@@ -1113,7 +1071,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto20"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
                 },
                 {
                   "type" : "field",
@@ -1126,7 +1084,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type4"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -1182,45 +1140,8 @@
           ]
         },
         {
-          "name" : "pre_parse_ipv6",
-          "id" : 9,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._is_ipv62"]
-                },
-                {
-                  "type" : "expression",
-                  "value" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "b2d",
-                      "left" : null,
-                      "right" : {
-                        "type" : "bool",
-                        "value" : true
-                      }
-                    }
-                  }
-                }
-              ],
-              "op" : "set"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : "parse_ipv6"
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_ipv6",
-          "id" : 10,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1235,7 +1156,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto20"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
                 },
                 {
                   "type" : "field",
@@ -1248,7 +1169,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type4"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
                 },
                 {
                   "type" : "hexstr",
@@ -1292,7 +1213,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 11,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1307,7 +1228,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport21"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -1320,7 +1241,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport22"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -1341,7 +1262,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 12,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1356,7 +1277,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport21"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -1369,7 +1290,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport22"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -1401,7 +1322,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 13,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1424,7 +1345,7 @@
         },
         {
           "name" : "parse_gtpu",
-          "id" : 14,
+          "id" : 13,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1495,7 +1416,7 @@
         },
         {
           "name" : "do_parse_gtpu",
-          "id" : 15,
+          "id" : 14,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1563,7 +1484,7 @@
         },
         {
           "name" : "parse_inner_udp",
-          "id" : 16,
+          "id" : 15,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1578,7 +1499,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport21"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
                 },
                 {
                   "type" : "field",
@@ -1591,7 +1512,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport22"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
                 },
                 {
                   "type" : "field",
@@ -1612,7 +1533,7 @@
         },
         {
           "name" : "parse_int",
-          "id" : 17,
+          "id" : 16,
           "parser_ops" : [],
           "transitions" : [
             {
@@ -1636,7 +1557,7 @@
         },
         {
           "name" : "parse_intl4_shim",
-          "id" : 18,
+          "id" : 17,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1679,13 +1600,13 @@
         },
         {
           "name" : "parse_int_data",
-          "id" : 19,
+          "id" : 18,
           "parser_ops" : [
             {
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_1"]
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "expression",
@@ -1757,7 +1678,7 @@
                   "type" : "expression",
                   "value" : {
                     "type" : "field",
-                    "value" : ["scalars", "tmp_1"]
+                    "value" : ["scalars", "tmp_0"]
                   }
                 }
               ],
@@ -1775,7 +1696,7 @@
         },
         {
           "name" : "parse_intl4_tail",
-          "id" : 20,
+          "id" : 19,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1806,11 +1727,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 276,
+        "line" : 259,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "report_ethernet", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
+      "order" : ["packet_in", "report_ethernet", "report_eth_type", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "eth_type", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
     }
   ],
   "meter_arrays" : [
@@ -1819,7 +1740,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/bng.p4",
-        "line" : 152,
+        "line" : 151,
         "column" : 33,
         "source_fragment" : "m_besteff"
       },
@@ -1833,7 +1754,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/bng.p4",
-        "line" : 153,
+        "line" : 152,
         "column" : 33,
         "source_fragment" : "m_prio"
       },
@@ -1921,7 +1842,7 @@
       "id" : 6,
       "source_info" : {
         "filename" : "include/bng.p4",
-        "line" : 150,
+        "line" : 149,
         "column" : 49,
         "source_fragment" : "c_line_rx"
       },
@@ -1977,32 +1898,20 @@
       }
     },
     {
-      "name" : "FabricIngress.forwarding.routing_v4_counter",
-      "id" : 11,
-      "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.routing_v4",
-      "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 87,
-        "column" : 50,
-        "source_fragment" : "routing_v4_counter"
-      }
-    },
-    {
       "name" : "FabricIngress.forwarding.routing_v6_counter",
-      "id" : 12,
+      "id" : 11,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.routing_v6",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 119,
+        "line" : 128,
         "column" : 50,
         "source_fragment" : "routing_v6_counter"
       }
     },
     {
       "name" : "FabricIngress.acl.acl_counter",
-      "id" : 13,
+      "id" : 12,
       "is_direct" : true,
       "binding" : "FabricIngress.acl.acl",
       "source_info" : {
@@ -2014,7 +1923,7 @@
     },
     {
       "name" : "FabricIngress.next.next_vlan_counter",
-      "id" : 14,
+      "id" : 13,
       "is_direct" : true,
       "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
@@ -2026,7 +1935,7 @@
     },
     {
       "name" : "FabricIngress.next.xconnect_counter",
-      "id" : 15,
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
@@ -2038,43 +1947,43 @@
     },
     {
       "name" : "FabricIngress.next.simple_counter",
-      "id" : 16,
+      "id" : 15,
       "is_direct" : true,
       "binding" : "FabricIngress.next.simple",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 137,
+        "line" : 136,
         "column" : 50,
         "source_fragment" : "simple_counter"
       }
     },
     {
       "name" : "FabricIngress.next.hashed_counter",
-      "id" : 17,
+      "id" : 16,
       "is_direct" : true,
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 178,
+        "line" : 180,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
     },
     {
       "name" : "FabricIngress.next.multicast_counter",
-      "id" : 18,
+      "id" : 17,
       "is_direct" : true,
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 222,
+        "line" : 224,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
     },
     {
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
-      "id" : 19,
+      "id" : 18,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 26,
@@ -2086,7 +1995,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 20,
+      "id" : 19,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 27,
@@ -2098,10 +2007,10 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.c_line_tx",
-      "id" : 21,
+      "id" : 20,
       "source_info" : {
         "filename" : "include/bng.p4",
-        "line" : 265,
+        "line" : 264,
         "column" : 49,
         "source_fragment" : "c_line_tx"
       },
@@ -2110,7 +2019,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 22,
+      "id" : 21,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -2122,12 +2031,12 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 23,
+      "id" : 22,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 310,
+        "line" : 309,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -2412,14 +2321,8 @@
       "primitives" : []
     },
     {
-      "name" : "nop",
-      "id" : 15,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "FabricIngress.spgw_ingress.gtpu_decap",
-      "id" : 16,
+      "id" : 15,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2471,7 +2374,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
-      "id" : 17,
+      "id" : 16,
       "runtime_data" : [
         {
           "name" : "teid",
@@ -2492,7 +2395,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
             },
             {
               "type" : "runtime_data",
@@ -2511,7 +2414,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr22"]
             },
             {
               "type" : "runtime_data",
@@ -2530,7 +2433,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr23"]
             },
             {
               "type" : "runtime_data",
@@ -2548,7 +2451,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 18,
+      "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2556,7 +2459,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source32"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source28"]
             },
             {
               "type" : "expression",
@@ -2584,7 +2487,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_sink",
-      "id" : 19,
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2592,7 +2495,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink34"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink30"]
             },
             {
               "type" : "expression",
@@ -2620,7 +2523,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
-      "id" : 20,
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2651,7 +2554,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
@@ -2665,6 +2568,47 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
+      "id" : 20,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type24"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 160,
+            "column" : 36,
+            "source_fragment" : "2w0x0; ..."
+          }
+        },
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 74,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(smeta)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
       "id" : 21,
       "runtime_data" : [],
       "primitives" : [
@@ -2673,7 +2617,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type28"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type24"]
             },
             {
               "type" : "hexstr",
@@ -2682,7 +2626,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 155,
+            "line" : 160,
             "column" : 36,
             "source_fragment" : "2w0x0; ..."
           }
@@ -2697,48 +2641,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop(smeta)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
-      "id" : 22,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type28"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../header.p4",
-            "line" : 155,
-            "column" : 36,
-            "source_fragment" : "2w0x0; ..."
-          }
-        },
-        {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/bng.p4",
-            "line" : 75,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "mark_to_drop(smeta)"
           }
@@ -2747,7 +2650,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
-      "id" : 23,
+      "id" : 22,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2755,7 +2658,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["inner_vlan_tag", "eth_type"]
+              "value" : ["eth_type", "value"]
             },
             {
               "type" : "hexstr",
@@ -2764,26 +2667,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 114,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -2798,7 +2682,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 69,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.setInvalid()"
           }
@@ -2812,12 +2696,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 70,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "c_terminated.count(fmeta.bng.line_id)"
           }
@@ -2826,7 +2710,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v6",
-      "id" : 24,
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2834,7 +2718,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["inner_vlan_tag", "eth_type"]
+              "value" : ["eth_type", "value"]
             },
             {
               "type" : "hexstr",
@@ -2843,26 +2727,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 111,
-            "column" : 31,
-            "source_fragment" : "0x86dd; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x86dd"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 111,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -2877,7 +2742,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 69,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.setInvalid()"
           }
@@ -2891,12 +2756,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 70,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "c_terminated.count(fmeta.bng.line_id)"
           }
@@ -2905,7 +2770,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.set_session",
-      "id" : 25,
+      "id" : 24,
       "runtime_data" : [
         {
           "name" : "pppoe_session_id",
@@ -2918,7 +2783,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type28"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type24"]
             },
             {
               "type" : "hexstr",
@@ -2927,7 +2792,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 157,
+            "line" : 162,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -2937,7 +2802,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id30"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id26"]
             },
             {
               "type" : "runtime_data",
@@ -2946,7 +2811,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 157,
+            "line" : 156,
             "column" : 35,
             "source_fragment" : "= pppoe_session_id; ..."
           }
@@ -2960,12 +2825,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 158,
+            "line" : 157,
             "column" : 8,
             "source_fragment" : "c_line_rx.count(fmeta.bng.line_id)"
           }
@@ -2974,7 +2839,7 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.drop",
-      "id" : 26,
+      "id" : 25,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2982,7 +2847,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type28"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type24"]
             },
             {
               "type" : "hexstr",
@@ -2991,7 +2856,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 157,
+            "line" : 162,
             "column" : 39,
             "source_fragment" : "2w0x2;; ..."
           }
@@ -3005,12 +2870,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 163,
+            "line" : 162,
             "column" : 8,
             "source_fragment" : "c_line_rx.count(fmeta.bng.line_id)"
           }
@@ -3025,7 +2890,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 164,
+            "line" : 163,
             "column" : 8,
             "source_fragment" : "mark_to_drop(smeta)"
           }
@@ -3034,12 +2899,18 @@
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
-      "id" : 27,
+      "id" : 26,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
+      "id" : 27,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
       "id" : 28,
       "runtime_data" : [],
       "primitives" : []
@@ -3051,14 +2922,8 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
-      "id" : 30,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "FabricIngress.bng_ingress.set_line",
-      "id" : 31,
+      "id" : 30,
       "runtime_data" : [
         {
           "name" : "line_id",
@@ -3071,7 +2936,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             },
             {
               "type" : "runtime_data",
@@ -3080,7 +2945,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 321,
+            "line" : 320,
             "column" : 30,
             "source_fragment" : "= line_id; ..."
           }
@@ -3089,7 +2954,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 32,
+      "id" : 31,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3097,7 +2962,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_forwarding14"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
             },
             {
               "type" : "expression",
@@ -3126,7 +2991,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next15"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
             },
             {
               "type" : "expression",
@@ -3154,13 +3019,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 33,
+      "id" : 32,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 34,
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -3173,7 +3038,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -3191,7 +3056,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 35,
+      "id" : 34,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -3204,7 +3069,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._fwd_type16"]
+              "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
             },
             {
               "type" : "runtime_data",
@@ -3222,7 +3087,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 36,
+      "id" : 35,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3235,7 +3100,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id17"]
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3253,7 +3118,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 37,
+      "id" : 36,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3266,7 +3131,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label12"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
             },
             {
               "type" : "hexstr",
@@ -3285,7 +3150,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id17"]
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3303,7 +3168,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 38,
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3316,7 +3181,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id17"]
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3334,13 +3199,13 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 39,
+      "id" : 38,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
-      "id" : 40,
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3353,7 +3218,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id17"]
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3371,7 +3236,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_next_id_acl",
-      "id" : 41,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3384,7 +3249,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id17"]
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3402,7 +3267,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 42,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3429,7 +3294,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next15"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
             },
             {
               "type" : "expression",
@@ -3457,7 +3322,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 43,
+      "id" : 42,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -3488,7 +3353,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 44,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3511,7 +3376,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._skip_next15"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next11"]
             },
             {
               "type" : "expression",
@@ -3539,13 +3404,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 45,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 46,
+      "id" : 45,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -3558,7 +3423,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -3576,7 +3441,7 @@
     },
     {
       "name" : "FabricIngress.next.set_double_vlan",
-      "id" : 47,
+      "id" : 46,
       "runtime_data" : [
         {
           "name" : "outer_vlan_id",
@@ -3593,7 +3458,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
             },
             {
               "type" : "runtime_data",
@@ -3612,7 +3477,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._push_double_vlan8"]
+              "value" : ["scalars", "fabric_metadata_t._push_double_vlan4"]
             },
             {
               "type" : "expression",
@@ -3641,7 +3506,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id9"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
             },
             {
               "type" : "runtime_data",
@@ -3659,7 +3524,7 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 48,
+      "id" : 47,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3685,31 +3550,12 @@
             "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 107,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
         }
       ]
     },
     {
       "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 49,
+      "id" : 48,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -3722,7 +3568,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._next_id17"]
+              "value" : ["scalars", "fabric_metadata_t._next_id13"]
             },
             {
               "type" : "runtime_data",
@@ -3731,7 +3577,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 112,
+            "line" : 111,
             "column" : 32,
             "source_fragment" : "= next_id; ..."
           }
@@ -3740,7 +3586,7 @@
     },
     {
       "name" : "FabricIngress.next.output_simple",
-      "id" : 50,
+      "id" : 49,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3771,7 +3617,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_simple",
-      "id" : 51,
+      "id" : 50,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3848,7 +3694,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_simple",
-      "id" : 52,
+      "id" : 51,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3873,7 +3719,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label12"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
             },
             {
               "type" : "runtime_data",
@@ -3948,7 +3794,7 @@
     },
     {
       "name" : "FabricIngress.next.output_hashed",
-      "id" : 53,
+      "id" : 52,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3979,7 +3825,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_hashed",
-      "id" : 54,
+      "id" : 53,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4056,7 +3902,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 55,
+      "id" : 54,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4081,7 +3927,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label12"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
             },
             {
               "type" : "runtime_data",
@@ -4156,7 +4002,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 56,
+      "id" : 55,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -4178,7 +4024,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 225,
+            "line" : 227,
             "column" : 8,
             "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
@@ -4188,7 +4034,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_multicast18"]
+              "value" : ["scalars", "fabric_metadata_t._is_multicast14"]
             },
             {
               "type" : "expression",
@@ -4207,7 +4053,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 226,
+            "line" : 228,
             "column" : 37,
             "source_fragment" : "= true; ..."
           }
@@ -4216,7 +4062,7 @@
     },
     {
       "name" : "act",
-      "id" : 57,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4252,7 +4098,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 58,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4312,7 +4158,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 59,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4338,7 +4184,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 60,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4360,7 +4206,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 61,
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4424,7 +4270,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 62,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4466,7 +4312,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out19"]
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out15"]
             },
             {
               "type" : "expression",
@@ -4504,7 +4350,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 63,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4512,7 +4358,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
             },
             {
               "type" : "field",
@@ -4521,7 +4367,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 110,
+            "line" : 109,
             "column" : 36,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
@@ -4531,7 +4377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri6"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
             },
             {
               "type" : "field",
@@ -4540,7 +4386,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 111,
+            "line" : 110,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
@@ -4550,7 +4396,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi7"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
             },
             {
               "type" : "field",
@@ -4559,7 +4405,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 112,
+            "line" : 111,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
@@ -4568,7 +4414,7 @@
     },
     {
       "name" : "act_6",
-      "id" : 64,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4576,7 +4422,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id9"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
             },
             {
               "type" : "field",
@@ -4585,7 +4431,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 116,
+            "line" : 115,
             "column" : 42,
             "source_fragment" : "= hdr.inner_vlan_tag.vlan_id; ..."
           }
@@ -4595,7 +4441,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri10"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri6"]
             },
             {
               "type" : "field",
@@ -4604,7 +4450,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 117,
+            "line" : 116,
             "column" : 43,
             "source_fragment" : "= hdr.inner_vlan_tag.pri; ..."
           }
@@ -4614,7 +4460,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi11"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi7"]
             },
             {
               "type" : "field",
@@ -4623,7 +4469,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 118,
+            "line" : 117,
             "column" : 43,
             "source_fragment" : "= hdr.inner_vlan_tag.cfi; ..."
           }
@@ -4632,7 +4478,7 @@
     },
     {
       "name" : "act_7",
-      "id" : 65,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4640,7 +4486,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl13"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
             },
             {
               "type" : "hexstr",
@@ -4649,7 +4495,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 126,
+            "line" : 125,
             "column" : 37,
             "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
@@ -4658,111 +4504,7 @@
     },
     {
       "name" : "act_8",
-      "id" : 66,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 108,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
-      "id" : 67,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            },
-            {
-              "type" : "field",
-              "value" : ["inner_vlan_tag", "eth_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 136,
-            "column" : 50,
-            "source_fragment" : "= hdr.inner_vlan_tag.eth_type; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 68,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "eth_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 139,
-            "column" : 50,
-            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 69,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "eth_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 141,
-            "column" : 46,
-            "source_fragment" : "= hdr.ethernet.eth_type; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_12",
-      "id" : 70,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4791,8 +4533,116 @@
       ]
     },
     {
+      "name" : "act_9",
+      "id" : 66,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 67,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 149,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_11",
+      "id" : 68,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 147,
+            "column" : 36,
+            "source_fragment" : "2w1; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_12",
+      "id" : 69,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
       "name" : "act_13",
-      "id" : 71,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4800,7 +4650,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4822,29 +4672,7 @@
     },
     {
       "name" : "act_14",
-      "id" : 72,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 149,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_15",
-      "id" : 73,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4852,93 +4680,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction23"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 143,
-            "column" : 36,
-            "source_fragment" : "2w1; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_16",
-      "id" : 74,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_17",
-      "id" : 75,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_18",
-      "id" : 76,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction23"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
             },
             {
               "type" : "hexstr",
@@ -4947,7 +4689,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 144,
+            "line" : 148,
             "column" : 38,
             "source_fragment" : "2w2; ..."
           }
@@ -4955,8 +4697,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 77,
+      "name" : "act_15",
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4964,7 +4706,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction23"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
             },
             {
               "type" : "hexstr",
@@ -4973,7 +4715,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 142,
+            "line" : 146,
             "column" : 37,
             "source_fragment" : "2w0; ..."
           }
@@ -5010,8 +4752,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 78,
+      "name" : "act_16",
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5040,8 +4782,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 79,
+      "name" : "act_17",
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5049,7 +4791,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
             },
             {
               "type" : "field",
@@ -5066,8 +4808,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 80,
+      "name" : "act_18",
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5075,7 +4817,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_1"]
             },
             {
               "type" : "expression",
@@ -5111,7 +4853,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_2"]
+              "value" : ["scalars", "tmp_1"]
             }
           ],
           "source_info" : {
@@ -5124,8 +4866,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 81,
+      "name" : "act_19",
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5133,7 +4875,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_5"]
             },
             {
               "type" : "expression",
@@ -5169,7 +4911,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_3"]
+              "value" : ["scalars", "tmp_5"]
             }
           ],
           "source_info" : {
@@ -5182,8 +4924,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 82,
+      "name" : "act_20",
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5208,8 +4950,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 83,
+      "name" : "act_21",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5226,7 +4968,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 339,
+            "line" : 338,
             "column" : 16,
             "source_fragment" : "s_tag = hdr.vlan_tag.vlan_id"
           }
@@ -5245,7 +4987,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 340,
+            "line" : 339,
             "column" : 16,
             "source_fragment" : "c_tag = hdr.inner_vlan_tag.vlan_id"
           }
@@ -5253,8 +4995,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 84,
+      "name" : "act_22",
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5266,12 +5008,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 344,
+            "line" : 343,
             "column" : 16,
             "source_fragment" : "s_tag = fmeta.vlan_id; ..."
           }
@@ -5285,12 +5027,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id9"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 345,
+            "line" : 344,
             "column" : 16,
             "source_fragment" : "c_tag = fmeta.inner_vlan_id; ..."
           }
@@ -5298,8 +5040,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 85,
+      "name" : "act_23",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5328,8 +5070,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 86,
+      "name" : "act_24",
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5358,8 +5100,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 87,
+      "name" : "act_25",
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5367,7 +5109,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type28"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type24"]
             },
             {
               "type" : "hexstr",
@@ -5376,7 +5118,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../header.p4",
-            "line" : 156,
+            "line" : 161,
             "column" : 37,
             "source_fragment" : "2w0x1; ..."
           }
@@ -5407,8 +5149,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 88,
+      "name" : "act_26",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5435,7 +5177,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 124,
+            "line" : 123,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -5443,8 +5185,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 89,
+      "name" : "act_27",
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5456,12 +5198,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 129,
+            "line" : 128,
             "column" : 20,
             "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
           }
@@ -5469,8 +5211,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 90,
+      "name" : "act_28",
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5482,12 +5224,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 137,
+            "line" : 136,
             "column" : 19,
             "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
           }
@@ -5495,8 +5237,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 91,
+      "name" : "act_29",
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5546,7 +5288,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 110,
+            "line" : 109,
             "column" : 12,
             "source_fragment" : "hdr.ipv6.src_addr[127:64]"
           }
@@ -5554,8 +5296,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 92,
+      "name" : "act_30",
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5584,8 +5326,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 93,
+      "name" : "act_31",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5614,8 +5356,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 94,
+      "name" : "act_32",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5627,16 +5369,16 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result31"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 236,
+            "line" : 235,
             "column" : 24,
             "source_fragment" : "m_prio.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           }
@@ -5644,8 +5386,8 @@
       ]
     },
     {
-      "name" : "act_37",
-      "id" : 95,
+      "name" : "act_33",
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5657,16 +5399,16 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result31"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 239,
+            "line" : 238,
             "column" : 24,
             "source_fragment" : "m_besteff.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           }
@@ -5674,8 +5416,8 @@
       ]
     },
     {
-      "name" : "act_38",
-      "id" : 96,
+      "name" : "act_34",
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5687,16 +5429,16 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result31"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 248,
+            "line" : 247,
             "column" : 24,
             "source_fragment" : "m_prio.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           }
@@ -5704,8 +5446,8 @@
       ]
     },
     {
-      "name" : "act_39",
-      "id" : 97,
+      "name" : "act_35",
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5717,16 +5459,16 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result31"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result27"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 251,
+            "line" : 250,
             "column" : 24,
             "source_fragment" : "m_besteff.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           }
@@ -5735,43 +5477,43 @@
     },
     {
       "name" : "nop",
+      "id" : 93,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 94,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 95,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 96,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 97,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
       "id" : 98,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "nop",
-      "id" : 99,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 100,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 101,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 102,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 103,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 104,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5822,7 +5564,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 125,
+            "line" : 129,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -5978,7 +5720,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 138,
+            "line" : 142,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -5997,7 +5739,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 122,
+            "line" : 126,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -6011,7 +5753,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr26"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr22"]
             }
           ],
           "source_info" : {
@@ -6030,7 +5772,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr27"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr23"]
             }
           ],
           "source_info" : {
@@ -6131,7 +5873,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6330,7 +6072,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len24"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len20"]
             }
           ],
           "source_info" : {
@@ -6349,7 +6091,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid25"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid21"]
             }
           ],
           "source_info" : {
@@ -6363,7 +6105,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v4",
-      "id" : 105,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6371,7 +6113,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["inner_vlan_tag", "eth_type"]
+              "value" : ["eth_type", "value"]
             },
             {
               "type" : "hexstr",
@@ -6380,7 +6122,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 114,
+            "line" : 118,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6395,7 +6137,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 271,
+            "line" : 270,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.setValid()"
           }
@@ -6414,7 +6156,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 272,
+            "line" : 271,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.version = 4w1"
           }
@@ -6433,7 +6175,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 273,
+            "line" : 272,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.type_id = 4w1"
           }
@@ -6452,7 +6194,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 274,
+            "line" : 273,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.code = 8w0"
           }
@@ -6466,12 +6208,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id30"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id26"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 275,
+            "line" : 274,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.session_id = fmeta.bng.pppoe_session_id; ..."
           }
@@ -6485,12 +6227,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 276,
+            "line" : 275,
             "column" : 8,
             "source_fragment" : "c_line_tx.count(fmeta.bng.line_id)"
           }
@@ -6532,7 +6274,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 281,
+            "line" : 280,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.length = hdr.ipv4.total_len + 16w2"
           }
@@ -6551,7 +6293,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 120,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -6560,7 +6302,7 @@
     },
     {
       "name" : "FabricEgress.bng_egress.downstream.encap_v6",
-      "id" : 106,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6568,7 +6310,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["inner_vlan_tag", "eth_type"]
+              "value" : ["eth_type", "value"]
             },
             {
               "type" : "hexstr",
@@ -6577,7 +6319,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 114,
+            "line" : 118,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -6592,7 +6334,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 271,
+            "line" : 270,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.setValid()"
           }
@@ -6611,7 +6353,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 272,
+            "line" : 271,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.version = 4w1"
           }
@@ -6630,7 +6372,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 273,
+            "line" : 272,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.type_id = 4w1"
           }
@@ -6649,7 +6391,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 274,
+            "line" : 273,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.code = 8w0"
           }
@@ -6663,12 +6405,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id30"]
+              "value" : ["scalars", "fabric_metadata_t._bng_pppoe_session_id26"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 275,
+            "line" : 274,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.session_id = fmeta.bng.pppoe_session_id; ..."
           }
@@ -6682,12 +6424,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id29"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 276,
+            "line" : 275,
             "column" : 8,
             "source_fragment" : "c_line_tx.count(fmeta.bng.line_id)"
           }
@@ -6729,7 +6471,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 288,
+            "line" : 287,
             "column" : 8,
             "source_fragment" : "hdr.pppoe.length = hdr.ipv6.payload_len + 16w42"
           }
@@ -6748,7 +6490,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 121,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -6757,7 +6499,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 107,
+      "id" : 102,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -6825,7 +6567,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 153,
+            "line" : 157,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -7116,7 +6858,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport22"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
             }
           ],
           "source_info" : {
@@ -7243,7 +6985,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 149,
+            "line" : 153,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -7252,7 +6994,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 108,
+      "id" : 103,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -7265,7 +7007,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit33"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit29"]
             },
             {
               "type" : "expression",
@@ -7294,7 +7036,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             },
             {
               "type" : "runtime_data",
@@ -7312,13 +7054,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 109,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 110,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7392,7 +7134,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7406,7 +7148,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7434,7 +7176,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7448,7 +7190,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7475,7 +7217,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 111,
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7517,7 +7259,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7531,7 +7273,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7559,7 +7301,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7573,7 +7315,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7600,7 +7342,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 112,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7708,7 +7450,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7722,7 +7464,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7750,7 +7492,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7764,7 +7506,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7791,7 +7533,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 113,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7878,7 +7620,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7892,7 +7634,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7920,7 +7662,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7934,7 +7676,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7961,7 +7703,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 114,
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8114,7 +7856,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8128,7 +7870,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8156,7 +7898,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8170,7 +7912,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8197,7 +7939,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 115,
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8318,7 +8060,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8332,7 +8074,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8360,7 +8102,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8374,7 +8116,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8401,7 +8143,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 116,
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8588,7 +8330,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8602,7 +8344,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8630,7 +8372,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8644,7 +8386,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8671,7 +8413,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 117,
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8698,7 +8440,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -8713,7 +8455,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8727,7 +8469,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8755,7 +8497,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8769,7 +8511,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8796,7 +8538,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 118,
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8889,7 +8631,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -8904,7 +8646,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8918,7 +8660,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8946,7 +8688,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8960,7 +8702,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8987,7 +8729,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 119,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9048,7 +8790,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -9063,7 +8805,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9077,7 +8819,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9105,7 +8847,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9119,7 +8861,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9146,7 +8888,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 120,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9273,7 +9015,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -9288,7 +9030,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9302,7 +9044,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9330,7 +9072,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9344,7 +9086,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9371,7 +9113,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 121,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9477,7 +9219,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -9492,7 +9234,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9506,7 +9248,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9534,7 +9276,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9548,7 +9290,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9575,7 +9317,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 122,
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9747,7 +9489,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -9762,7 +9504,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9776,7 +9518,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9804,7 +9546,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9818,7 +9560,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9845,7 +9587,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 123,
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9985,7 +9727,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -10000,7 +9742,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10014,7 +9756,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10042,7 +9784,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10056,7 +9798,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10083,7 +9825,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 124,
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10289,7 +10031,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id35"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -10304,7 +10046,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10318,7 +10060,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10346,7 +10088,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10360,7 +10102,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10387,13 +10129,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 125,
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 126,
+      "id" : 121,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10435,7 +10177,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10449,7 +10191,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10477,7 +10219,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10491,7 +10233,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10518,7 +10260,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 127,
+      "id" : 122,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10579,7 +10321,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10593,7 +10335,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10621,7 +10363,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10635,7 +10377,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10662,7 +10404,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 128,
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10757,7 +10499,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10771,7 +10513,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10799,7 +10541,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10813,7 +10555,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10840,7 +10582,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 129,
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10905,7 +10647,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10919,7 +10661,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10947,7 +10689,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10961,7 +10703,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10988,7 +10730,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 130,
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11087,7 +10829,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -11101,7 +10843,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11129,7 +10871,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -11143,7 +10885,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11170,7 +10912,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 131,
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11288,7 +11030,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -11302,7 +11044,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11330,7 +11072,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -11344,7 +11086,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11371,7 +11113,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 132,
+      "id" : 127,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11523,7 +11265,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -11537,7 +11279,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11565,7 +11307,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -11579,7 +11321,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11606,7 +11348,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 133,
+      "id" : 128,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11648,7 +11390,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -11662,7 +11404,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11690,7 +11432,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -11704,7 +11446,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11731,7 +11473,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 134,
+      "id" : 129,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11807,7 +11549,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -11821,7 +11563,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11849,7 +11591,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -11863,7 +11605,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11890,7 +11632,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 135,
+      "id" : 130,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11985,7 +11727,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -11999,7 +11741,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12027,7 +11769,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -12041,7 +11783,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12068,7 +11810,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 136,
+      "id" : 131,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12197,7 +11939,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -12211,7 +11953,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12239,7 +11981,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -12253,7 +11995,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12280,7 +12022,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 137,
+      "id" : 132,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12379,7 +12121,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -12393,7 +12135,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12421,7 +12163,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -12435,7 +12177,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12462,7 +12204,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 138,
+      "id" : 133,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12595,7 +12337,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -12609,7 +12351,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12637,7 +12379,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -12651,7 +12393,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12678,7 +12420,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 139,
+      "id" : 134,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12830,7 +12572,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -12844,7 +12586,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12872,7 +12614,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -12886,7 +12628,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12913,7 +12655,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 140,
+      "id" : 135,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13099,7 +12841,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -13113,7 +12855,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13141,7 +12883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -13155,7 +12897,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13182,7 +12924,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 141,
+      "id" : 136,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -13264,7 +13006,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["report_ethernet", "eth_type"]
+              "value" : ["report_eth_type", "value"]
             },
             {
               "type" : "hexstr",
@@ -13273,7 +13015,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 114,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -13501,7 +13243,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 122,
+            "line" : 126,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -13687,7 +13429,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 159,
+            "line" : 163,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -13782,7 +13524,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 163,
+            "line" : 167,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -13829,7 +13571,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 142,
+      "id" : 137,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13874,7 +13616,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 143,
+      "id" : 138,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14205,7 +13947,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 144,
+      "id" : 139,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14218,7 +13960,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 264,
+            "line" : 266,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setInvalid()"
           }
@@ -14228,25 +13970,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
+              "value" : ["eth_type", "value"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._ip_eth_type4"]
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 266,
-            "column" : 38,
-            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.eth_type.value = fabric_metadata.ip_eth_type; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 145,
+      "id" : 140,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14259,7 +14001,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 271,
+            "line" : 273,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
           }
@@ -14273,12 +14015,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_label12"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 274,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
@@ -14297,7 +14039,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 273,
+            "line" : 275,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = 3w0"
           }
@@ -14316,7 +14058,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 274,
+            "line" : 276,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
           }
@@ -14330,12 +14072,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._mpls_ttl13"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl9"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 275,
+            "line" : 277,
             "column" : 8,
             "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
@@ -14345,7 +14087,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
+              "value" : ["eth_type", "value"]
             },
             {
               "type" : "hexstr",
@@ -14354,7 +14096,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 112,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -14363,7 +14105,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 146,
+      "id" : 141,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14376,7 +14118,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 283,
+            "line" : 285,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setValid()"
           }
@@ -14390,12 +14132,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi7"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 284,
+            "line" : 286,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
@@ -14409,12 +14151,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri6"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 285,
+            "line" : 287,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
@@ -14427,15 +14169,15 @@
               "value" : ["vlan_tag", "eth_type"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
+              "type" : "hexstr",
+              "value" : "0x8100"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 286,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.last_eth_type; ..."
+            "filename" : "include/control/../define.p4",
+            "line" : 111,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
           }
         },
         {
@@ -14447,40 +14189,21 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 287,
+            "line" : 289,
             "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.push_vlan",
-      "id" : 147,
+      "id" : 142,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14493,7 +14216,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 283,
+            "line" : 285,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setValid()"
           }
@@ -14507,12 +14230,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_cfi7"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 284,
+            "line" : 286,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
@@ -14526,12 +14249,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_pri6"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 285,
+            "line" : 287,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
@@ -14544,15 +14267,15 @@
               "value" : ["vlan_tag", "eth_type"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
+              "type" : "hexstr",
+              "value" : "0x8100"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 286,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.last_eth_type; ..."
+            "filename" : "include/control/../define.p4",
+            "line" : 111,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
           }
         },
         {
@@ -14564,40 +14287,21 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 287,
+            "line" : 289,
             "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.push_inner_vlan",
-      "id" : 148,
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14624,7 +14328,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi11"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_cfi7"]
             }
           ],
           "source_info" : {
@@ -14643,7 +14347,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri10"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_pri6"]
             }
           ],
           "source_info" : {
@@ -14662,7 +14366,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id9"]
+              "value" : ["scalars", "fabric_metadata_t._inner_vlan_id5"]
             }
           ],
           "source_info" : {
@@ -14680,15 +14384,15 @@
               "value" : ["inner_vlan_tag", "eth_type"]
             },
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
+              "type" : "hexstr",
+              "value" : "0x8100"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 300,
-            "column" : 8,
-            "source_fragment" : "hdr.inner_vlan_tag.eth_type = fabric_metadata.last_eth_type; ..."
+            "filename" : "include/control/../define.p4",
+            "line" : 111,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
           }
         },
         {
@@ -14705,57 +14409,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 107,
+            "line" : 111,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "eth_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x88a8"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 105,
-            "column" : 31,
-            "source_fragment" : "0x88A8; ..."
-          }
         }
       ]
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 149,
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "eth_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._last_eth_type0"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 313,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.last_eth_type; ..."
-          }
-        },
-        {
           "op" : "remove_header",
           "parameters" : [
             {
@@ -14765,7 +14431,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 314,
+            "line" : 312,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -14773,8 +14439,8 @@
       ]
     },
     {
-      "name" : "act_40",
-      "id" : 150,
+      "name" : "act_36",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14790,8 +14456,8 @@
       ]
     },
     {
-      "name" : "act_41",
-      "id" : 151,
+      "name" : "act_37",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14841,8 +14507,8 @@
       ]
     },
     {
-      "name" : "act_42",
-      "id" : 152,
+      "name" : "act_38",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14855,7 +14521,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 335,
+            "line" : 333,
             "column" : 12,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -14863,8 +14529,8 @@
       ]
     },
     {
-      "name" : "act_43",
-      "id" : 153,
+      "name" : "act_39",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14893,8 +14559,8 @@
       ]
     },
     {
-      "name" : "act_44",
-      "id" : 154,
+      "name" : "act_40",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14923,8 +14589,8 @@
       ]
     },
     {
-      "name" : "act_45",
-      "id" : 155,
+      "name" : "act_41",
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14937,7 +14603,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 351,
+            "line" : 349,
             "column" : 12,
             "source_fragment" : "hdr.inner_vlan_tag.setInvalid()"
           }
@@ -14945,8 +14611,8 @@
       ]
     },
     {
-      "name" : "act_46",
-      "id" : 156,
+      "name" : "act_42",
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14959,7 +14625,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 368,
+            "line" : 366,
             "column" : 35,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -14967,8 +14633,8 @@
       ]
     },
     {
-      "name" : "act_47",
-      "id" : 157,
+      "name" : "act_43",
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15008,7 +14674,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 367,
+            "line" : 365,
             "column" : 12,
             "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
           }
@@ -15016,8 +14682,8 @@
       ]
     },
     {
-      "name" : "act_48",
-      "id" : 158,
+      "name" : "act_44",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15030,7 +14696,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 372,
+            "line" : 370,
             "column" : 39,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -15038,8 +14704,8 @@
       ]
     },
     {
-      "name" : "act_49",
-      "id" : 159,
+      "name" : "act_45",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15079,7 +14745,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 371,
+            "line" : 369,
             "column" : 16,
             "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
           }
@@ -15087,8 +14753,8 @@
       ]
     },
     {
-      "name" : "act_50",
-      "id" : 160,
+      "name" : "act_46",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15101,7 +14767,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 377,
+            "line" : 375,
             "column" : 45,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -15109,8 +14775,8 @@
       ]
     },
     {
-      "name" : "act_51",
-      "id" : 161,
+      "name" : "act_47",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15150,7 +14816,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 374,
             "column" : 16,
             "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
           }
@@ -15158,8 +14824,8 @@
       ]
     },
     {
-      "name" : "act_52",
-      "id" : 162,
+      "name" : "act_48",
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15188,8 +14854,8 @@
       ]
     },
     {
-      "name" : "act_53",
-      "id" : 163,
+      "name" : "act_49",
+      "id" : 158,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15224,8 +14890,8 @@
       ]
     },
     {
-      "name" : "act_54",
-      "id" : 164,
+      "name" : "act_50",
+      "id" : 159,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15251,7 +14917,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       }
                     }
                   },
@@ -15273,8 +14939,8 @@
       ]
     },
     {
-      "name" : "act_55",
-      "id" : 165,
+      "name" : "act_51",
+      "id" : 160,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15322,8 +14988,8 @@
       ]
     },
     {
-      "name" : "act_56",
-      "id" : 166,
+      "name" : "act_52",
+      "id" : 161,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15349,7 +15015,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes37"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       }
                     }
                   },
@@ -15371,8 +15037,8 @@
       ]
     },
     {
-      "name" : "act_57",
-      "id" : 167,
+      "name" : "act_53",
+      "id" : 162,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15398,7 +15064,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words36"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       }
                     }
                   },
@@ -15448,14 +15114,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
+          "action_ids" : [57],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15477,14 +15143,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
+          "action_ids" : [56],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15506,14 +15172,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
+          "action_ids" : [60],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15535,14 +15201,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
+          "action_ids" : [58],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15564,14 +15230,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
+          "action_ids" : [59],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15593,14 +15259,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62],
+          "action_ids" : [61],
           "actions" : ["act_4"],
           "base_default_next" : "node_12",
           "next_tables" : {
             "act_4" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15611,7 +15277,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 110,
+            "line" : 109,
             "column" : 36,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           },
@@ -15622,14 +15288,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
+          "action_ids" : [62],
           "actions" : ["act_5"],
           "base_default_next" : "node_14",
           "next_tables" : {
             "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15640,7 +15306,7 @@
           "id" : 7,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 116,
+            "line" : 115,
             "column" : 42,
             "source_fragment" : "= hdr.inner_vlan_tag.vlan_id; ..."
           },
@@ -15651,14 +15317,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
+          "action_ids" : [63],
           "actions" : ["act_6"],
           "base_default_next" : "node_16",
           "next_tables" : {
             "act_6" : "node_16"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15669,7 +15335,7 @@
           "id" : 8,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 126,
+            "line" : 125,
             "column" : 37,
             "source_fragment" : "="
           },
@@ -15680,130 +15346,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [65],
+          "action_ids" : [64],
           "actions" : ["act_7"],
-          "base_default_next" : "node_18",
-          "next_tables" : {
-            "act_7" : "node_18"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 131,
-            "column" : 42,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_8"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "act_8" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_7" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 66,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 10,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 136,
-            "column" : 50,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_9"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
-          "next_tables" : {
-            "act_9" : "FabricIngress.filtering.ingress_port_vlan"
-          },
-          "default_entry" : {
-            "action_id" : 67,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 11,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 139,
-            "column" : 50,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_10"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
-          "next_tables" : {
-            "act_10" : "FabricIngress.filtering.ingress_port_vlan"
-          },
-          "default_entry" : {
-            "action_id" : 68,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 141,
-            "column" : 46,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [69],
-          "actions" : ["act_11"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
-          "next_tables" : {
-            "act_11" : "FabricIngress.filtering.ingress_port_vlan"
-          },
-          "default_entry" : {
-            "action_id" : 69,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15811,7 +15361,7 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 13,
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 53,
@@ -15850,7 +15400,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 33, 34],
+          "action_ids" : [31, 32, 33],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -15859,7 +15409,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 32,
+            "action_id" : 31,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15867,7 +15417,7 @@
         },
         {
           "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 14,
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 90,
@@ -15888,21 +15438,15 @@
               "mask" : null
             },
             {
-              "match_type" : "exact",
-              "name" : "is_ipv4",
-              "target" : ["scalars", "fabric_metadata_t._is_ipv41"],
+              "match_type" : "ternary",
+              "name" : "eth_type",
+              "target" : ["eth_type", "value"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "is_ipv6",
-              "target" : ["scalars", "fabric_metadata_t._is_ipv62"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "is_mpls",
-              "target" : ["scalars", "fabric_metadata_t._is_mpls3"],
+              "name" : "ip_eth_type",
+              "target" : ["scalars", "fabric_metadata_t._ip_eth_type0"],
               "mask" : null
             }
           ],
@@ -15912,22 +15456,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35],
+          "action_ids" : [34],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "tbl_act_12",
+          "base_default_next" : "tbl_act_8",
           "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "tbl_act_12"
+            "FabricIngress.filtering.set_forwarding_type" : "tbl_act_8"
           },
           "default_entry" : {
-            "action_id" : 35,
+            "action_id" : 34,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 15,
+          "name" : "tbl_act_8",
+          "id" : 11,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15935,14 +15479,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [78],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_28",
+          "action_ids" : [73],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_21",
           "next_tables" : {
-            "act_20" : "node_28"
+            "act_16" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 73,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15950,7 +15494,7 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
-          "id" : 16,
+          "id" : 12,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 83,
@@ -15975,8 +15519,8 @@
           "actions" : ["nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_13",
-            "__MISS__" : "tbl_act_14"
+            "__HIT__" : "tbl_act_9",
+            "__MISS__" : "tbl_act_10"
           },
           "default_entry" : {
             "action_id" : 1,
@@ -15986,8 +15530,8 @@
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 17,
+          "name" : "tbl_act_9",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15995,22 +15539,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_32",
+          "action_ids" : [65],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_25",
           "next_tables" : {
-            "act_12" : "node_32"
+            "act_8" : "node_25"
           },
           "default_entry" : {
-            "action_id" : 70,
+            "action_id" : 65,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_14",
-          "id" : 18,
+          "name" : "tbl_act_10",
+          "id" : 14,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16018,22 +15562,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_32",
+          "action_ids" : [66],
+          "actions" : ["act_9"],
+          "base_default_next" : "node_25",
           "next_tables" : {
-            "act_13" : "node_32"
+            "act_9" : "node_25"
           },
           "default_entry" : {
-            "action_id" : 71,
+            "action_id" : 66,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_15",
-          "id" : 19,
+          "name" : "tbl_act_11",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 149,
@@ -16047,22 +15591,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_14"],
-          "base_default_next" : "tbl_act_16",
+          "action_ids" : [67],
+          "actions" : ["act_10"],
+          "base_default_next" : "tbl_act_12",
           "next_tables" : {
-            "act_14" : "tbl_act_16"
+            "act_10" : "tbl_act_12"
           },
           "default_entry" : {
-            "action_id" : 72,
+            "action_id" : 67,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 20,
+          "name" : "tbl_act_12",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 151,
@@ -16076,14 +15620,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_15"],
+          "action_ids" : [68],
+          "actions" : ["act_11"],
           "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
           "next_tables" : {
-            "act_15" : "tbl_spgw_ingress_gtpu_decap"
+            "act_11" : "tbl_spgw_ingress_gtpu_decap"
           },
           "default_entry" : {
-            "action_id" : 73,
+            "action_id" : 68,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16091,7 +15635,7 @@
         },
         {
           "name" : "tbl_spgw_ingress_gtpu_decap",
-          "id" : 21,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 152,
@@ -16105,14 +15649,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16],
+          "action_ids" : [15],
           "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
-          "base_default_next" : "node_42",
+          "base_default_next" : "node_35",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.gtpu_decap" : "node_42"
+            "FabricIngress.spgw_ingress.gtpu_decap" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 16,
+            "action_id" : 15,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16120,7 +15664,7 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
-          "id" : 22,
+          "id" : 18,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 70,
@@ -16141,12 +15685,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 0],
+          "action_ids" : [16, 0],
           "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_17",
-            "__MISS__" : "tbl_act_18"
+            "__HIT__" : "tbl_act_13",
+            "__MISS__" : "tbl_act_14"
           },
           "default_entry" : {
             "action_id" : 0,
@@ -16156,8 +15700,8 @@
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 23,
+          "name" : "tbl_act_13",
+          "id" : 19,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16165,22 +15709,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_16"],
-          "base_default_next" : "node_39",
+          "action_ids" : [69],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_32",
           "next_tables" : {
-            "act_16" : "node_39"
+            "act_12" : "node_32"
           },
           "default_entry" : {
-            "action_id" : 74,
+            "action_id" : 69,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 24,
+          "name" : "tbl_act_14",
+          "id" : 20,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16188,22 +15732,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_39",
+          "action_ids" : [70],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_32",
           "next_tables" : {
-            "act_17" : "node_39"
+            "act_13" : "node_32"
           },
           "default_entry" : {
-            "action_id" : 75,
+            "action_id" : 70,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 25,
+          "name" : "tbl_act_15",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 154,
@@ -16217,22 +15761,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_42",
+          "action_ids" : [71],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_35",
           "next_tables" : {
-            "act_18" : "node_42"
+            "act_14" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 71,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
-          "id" : 26,
+          "name" : "tbl_act_16",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 156,
@@ -16246,22 +15790,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_42",
+          "action_ids" : [72],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_35",
           "next_tables" : {
-            "act_19" : "node_42"
+            "act_15" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 72,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 27,
+          "name" : "tbl_act_17",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 175,
@@ -16275,14 +15819,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_44",
+          "action_ids" : [74],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_37",
           "next_tables" : {
-            "act_21" : "node_44"
+            "act_17" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16290,7 +15834,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 28,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -16301,7 +15845,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id5"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
               "mask" : null
             },
             {
@@ -16317,7 +15861,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36, 7],
+          "action_ids" : [35, 6],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -16325,7 +15869,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 7,
+            "action_id" : 6,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16333,7 +15877,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 29,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -16344,7 +15888,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t._mpls_label12"],
+              "target" : ["scalars", "fabric_metadata_t._mpls_label8"],
               "mask" : null
             }
           ],
@@ -16354,7 +15898,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37, 8],
+          "action_ids" : [36, 7],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -16362,7 +15906,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 8,
+            "action_id" : 7,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16370,10 +15914,10 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 30,
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 101,
+            "line" : 108,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
@@ -16388,10 +15932,10 @@
           "match_type" : "lpm",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : true,
+          "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38, 39, 9],
+          "action_ids" : [37, 38, 8],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -16400,7 +15944,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 8,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16408,10 +15952,10 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v6",
-          "id" : 31,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 126,
+            "line" : 135,
             "column" : 10,
             "source_fragment" : "routing_v6"
           },
@@ -16429,7 +15973,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40, 10],
+          "action_ids" : [39, 9],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -16437,7 +15981,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16445,7 +15989,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 32,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 60,
@@ -16462,19 +16006,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto20"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto16"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport21"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport17"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport22"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport18"],
               "mask" : null
             },
             {
@@ -16498,7 +16042,7 @@
             {
               "match_type" : "ternary",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t._last_eth_type0"],
+              "target" : ["eth_type", "value"],
               "mask" : null
             },
             {
@@ -16532,18 +16076,18 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41, 42, 43, 44, 45],
+          "action_ids" : [40, 41, 42, 43, 44],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
-          "base_default_next" : "node_54",
+          "base_default_next" : "node_47",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_54",
-            "FabricIngress.acl.punt_to_cpu" : "node_54",
-            "FabricIngress.acl.set_clone_session_id" : "node_54",
-            "FabricIngress.acl.drop" : "node_54",
-            "FabricIngress.acl.nop_acl" : "node_54"
+            "FabricIngress.acl.set_next_id_acl" : "node_47",
+            "FabricIngress.acl.punt_to_cpu" : "node_47",
+            "FabricIngress.acl.set_clone_session_id" : "node_47",
+            "FabricIngress.acl.drop" : "node_47",
+            "FabricIngress.acl.nop_acl" : "node_47"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16551,10 +16095,10 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 33,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 116,
+            "line" : 115,
             "column" : 10,
             "source_fragment" : "xconnect"
           },
@@ -16568,7 +16112,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id17"],
+              "target" : ["scalars", "fabric_metadata_t._next_id13"],
               "mask" : null
             }
           ],
@@ -16578,7 +16122,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48, 49, 12],
+          "action_ids" : [47, 48, 11],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -16587,7 +16131,7 @@
             "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 12,
+            "action_id" : 11,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16595,10 +16139,10 @@
         },
         {
           "name" : "FabricIngress.next.simple",
-          "id" : 34,
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 155,
+            "line" : 154,
             "column" : 10,
             "source_fragment" : "simple"
           },
@@ -16606,7 +16150,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id17"],
+              "target" : ["scalars", "fabric_metadata_t._next_id13"],
               "mask" : null
             }
           ],
@@ -16616,7 +16160,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50, 51, 52, 13],
+          "action_ids" : [49, 50, 51, 12],
           "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -16626,7 +16170,7 @@
             "nop" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 13,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16634,10 +16178,10 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 35,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 196,
+            "line" : 198,
             "column" : 10,
             "source_fragment" : "hashed"
           },
@@ -16645,7 +16189,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id17"],
+              "target" : ["scalars", "fabric_metadata_t._next_id13"],
               "mask" : null
             }
           ],
@@ -16656,7 +16200,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53, 54, 55, 14],
+          "action_ids" : [52, 53, 54, 13],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -16668,10 +16212,10 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 36,
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 230,
+            "line" : 232,
             "column" : 10,
             "source_fragment" : "multicast"
           },
@@ -16679,7 +16223,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id17"],
+              "target" : ["scalars", "fabric_metadata_t._next_id13"],
               "mask" : null
             }
           ],
@@ -16689,7 +16233,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56, 15],
+          "action_ids" : [55, 14],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -16697,7 +16241,7 @@
             "nop" : "FabricIngress.next.next_vlan"
           },
           "default_entry" : {
-            "action_id" : 15,
+            "action_id" : 14,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16705,7 +16249,7 @@
         },
         {
           "name" : "FabricIngress.next.next_vlan",
-          "id" : 37,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 82,
@@ -16716,7 +16260,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t._next_id17"],
+              "target" : ["scalars", "fabric_metadata_t._next_id13"],
               "mask" : null
             }
           ],
@@ -16726,24 +16270,24 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46, 47, 11],
+          "action_ids" : [45, 46, 10],
           "actions" : ["FabricIngress.next.set_vlan", "FabricIngress.next.set_double_vlan", "nop"],
-          "base_default_next" : "node_60",
+          "base_default_next" : "node_53",
           "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_60",
-            "FabricIngress.next.set_double_vlan" : "node_60",
-            "nop" : "node_60"
+            "FabricIngress.next.set_vlan" : "node_53",
+            "FabricIngress.next.set_double_vlan" : "node_53",
+            "nop" : "node_53"
           },
           "default_entry" : {
-            "action_id" : 11,
+            "action_id" : 10,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 38,
+          "name" : "tbl_act_18",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -16757,22 +16301,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [80],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_62",
+          "action_ids" : [75],
+          "actions" : ["act_18"],
+          "base_default_next" : "node_55",
           "next_tables" : {
-            "act_22" : "node_62"
+            "act_18" : "node_55"
           },
           "default_entry" : {
-            "action_id" : 80,
+            "action_id" : 75,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_23",
-          "id" : 39,
+          "name" : "tbl_act_19",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -16786,14 +16330,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["act_23"],
+          "action_ids" : [76],
+          "actions" : ["act_19"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_23" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_19" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 81,
+            "action_id" : 76,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16801,7 +16345,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 40,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -16822,7 +16366,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 2],
+          "action_ids" : [17, 2],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
@@ -16838,7 +16382,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 41,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 67,
@@ -16859,12 +16403,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 3],
+          "action_ids" : [18, 3],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
-          "base_default_next" : "node_66",
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_66",
-            "nop" : "node_66"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_59",
+            "nop" : "node_59"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -16874,8 +16418,8 @@
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 42,
+          "name" : "tbl_act_20",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 89,
@@ -16889,25 +16433,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_68",
+          "action_ids" : [77],
+          "actions" : ["act_20"],
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "act_24" : "node_68"
+            "act_20" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 82,
+            "action_id" : 77,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 43,
+          "name" : "tbl_act_21",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 339,
+            "line" : 338,
             "column" : 22,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           },
@@ -16918,25 +16462,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["act_25"],
+          "action_ids" : [78],
+          "actions" : ["act_21"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
-            "act_25" : "FabricIngress.bng_ingress.t_line_map"
+            "act_21" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 44,
+          "name" : "tbl_act_22",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 344,
+            "line" : 343,
             "column" : 22,
             "source_fragment" : "= fmeta.vlan_id; ..."
           },
@@ -16947,14 +16491,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
-          "actions" : ["act_26"],
+          "action_ids" : [79],
+          "actions" : ["act_22"],
           "base_default_next" : "FabricIngress.bng_ingress.t_line_map",
           "next_tables" : {
-            "act_26" : "FabricIngress.bng_ingress.t_line_map"
+            "act_22" : "FabricIngress.bng_ingress.t_line_map"
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 79,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16962,10 +16506,10 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.t_line_map",
-          "id" : 45,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 324,
+            "line" : 323,
             "column" : 14,
             "source_fragment" : "t_line_map"
           },
@@ -16989,26 +16533,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [6, 31],
-          "actions" : ["nop", "FabricIngress.bng_ingress.set_line"],
-          "base_default_next" : "node_72",
+          "action_ids" : [30],
+          "actions" : ["FabricIngress.bng_ingress.set_line"],
+          "base_default_next" : "node_65",
           "next_tables" : {
-            "nop" : "node_72",
-            "FabricIngress.bng_ingress.set_line" : "node_72"
+            "FabricIngress.bng_ingress.set_line" : "node_65"
           },
           "default_entry" : {
-            "action_id" : 6,
+            "action_id" : 30,
             "action_const" : true,
-            "action_data" : [],
+            "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
-          "id" : 46,
+          "name" : "tbl_act_23",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 353,
+            "line" : 352,
             "column" : 31,
             "source_fragment" : "="
           },
@@ -17019,14 +16562,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
-          "actions" : ["act_29"],
+          "action_ids" : [82],
+          "actions" : ["act_25"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
           "next_tables" : {
-            "act_29" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+            "act_25" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17034,7 +16577,7 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
-          "id" : 47,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 48,
@@ -17061,12 +16604,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [20, 4],
+          "action_ids" : [19, 4],
           "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_28",
-            "__MISS__" : "tbl_act_29"
+            "__HIT__" : "tbl_act_24",
+            "__MISS__" : "tbl_act_25"
           },
           "default_entry" : {
             "action_id" : 4,
@@ -17076,8 +16619,8 @@
           }
         },
         {
-          "name" : "tbl_act_28",
-          "id" : 48,
+          "name" : "tbl_act_24",
+          "id" : 44,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17085,22 +16628,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_77",
+          "action_ids" : [80],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "act_27" : "node_77"
+            "act_23" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 80,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_29",
-          "id" : 49,
+          "name" : "tbl_act_25",
+          "id" : 45,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17108,25 +16651,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_77",
+          "action_ids" : [81],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "act_28" : "node_77"
+            "act_24" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 81,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 50,
+          "name" : "tbl_act_26",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 124,
+            "line" : 123,
             "column" : 12,
             "source_fragment" : "return"
           },
@@ -17137,14 +16680,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
-          "actions" : ["act_30"],
-          "base_default_next" : "node_79",
+          "action_ids" : [83],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "act_30" : "node_79"
+            "act_26" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 83,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17152,10 +16695,10 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "id" : 51,
+          "id" : 47,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 85,
+            "line" : 84,
             "column" : 10,
             "source_fragment" : "t_pppoe_term_v4"
           },
@@ -17163,7 +16706,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id29"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
               "mask" : null
             },
             {
@@ -17185,26 +16728,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 21],
+          "action_ids" : [22, 20],
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_31",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_27",
             "FabricIngress.bng_ingress.upstream.term_enabled_v4" : null
           },
           "default_entry" : {
-            "action_id" : 21,
+            "action_id" : 20,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 52,
+          "name" : "tbl_act_27",
+          "id" : 48,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 129,
+            "line" : 128,
             "column" : 20,
             "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
           },
@@ -17215,25 +16758,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89],
-          "actions" : ["act_31"],
+          "action_ids" : [84],
+          "actions" : ["act_27"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_31" : null
+            "act_27" : null
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 53,
+          "name" : "tbl_act_28",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 110,
+            "line" : 109,
             "column" : 12,
             "source_fragment" : "hdr.ipv6.src_addr[127:64]"
           },
@@ -17244,14 +16787,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
-          "actions" : ["act_33"],
+          "action_ids" : [86],
+          "actions" : ["act_29"],
           "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
           "next_tables" : {
-            "act_33" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+            "act_29" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17259,10 +16802,10 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
-          "id" : 54,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 107,
+            "line" : 106,
             "column" : 10,
             "source_fragment" : "t_pppoe_term_v6"
           },
@@ -17270,7 +16813,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id29"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
               "mask" : null
             },
             {
@@ -17292,26 +16835,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [24, 22],
+          "action_ids" : [23, 21],
           "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v6", "FabricIngress.bng_ingress.upstream.term_disabled"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_33",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "tbl_act_29",
             "FabricIngress.bng_ingress.upstream.term_enabled_v6" : null
           },
           "default_entry" : {
-            "action_id" : 22,
+            "action_id" : 21,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 55,
+          "name" : "tbl_act_29",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 137,
+            "line" : 136,
             "column" : 19,
             "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
           },
@@ -17322,14 +16865,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90],
-          "actions" : ["act_32"],
+          "action_ids" : [85],
+          "actions" : ["act_28"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_32" : null
+            "act_28" : null
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17337,10 +16880,10 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_line_session_map",
-          "id" : 56,
+          "id" : 52,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 167,
+            "line" : 166,
             "column" : 10,
             "source_fragment" : "t_line_session_map"
           },
@@ -17348,7 +16891,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id29"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
               "mask" : null
             }
           ],
@@ -17358,12 +16901,12 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [5, 25, 26],
+          "action_ids" : [5, 24, 25],
           "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_session", "FabricIngress.bng_ingress.downstream.drop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_34",
-            "__MISS__" : "tbl_act_35"
+            "__HIT__" : "tbl_act_30",
+            "__MISS__" : "tbl_act_31"
           },
           "default_entry" : {
             "action_id" : 5,
@@ -17373,8 +16916,8 @@
           }
         },
         {
-          "name" : "tbl_act_34",
-          "id" : 57,
+          "name" : "tbl_act_30",
+          "id" : 53,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17382,22 +16925,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
-          "actions" : ["act_34"],
-          "base_default_next" : "node_90",
+          "action_ids" : [87],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_83",
           "next_tables" : {
-            "act_34" : "node_90"
+            "act_30" : "node_83"
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_35",
-          "id" : 58,
+          "name" : "tbl_act_31",
+          "id" : 54,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17405,14 +16948,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["act_35"],
-          "base_default_next" : "node_90",
+          "action_ids" : [88],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_83",
           "next_tables" : {
-            "act_35" : "node_90"
+            "act_31" : "node_83"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17420,10 +16963,10 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "id" : 59,
+          "id" : 55,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 192,
+            "line" : 191,
             "column" : 10,
             "source_fragment" : "t_qos_v4"
           },
@@ -17431,7 +16974,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id29"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
               "mask" : null
             },
             {
@@ -17459,26 +17002,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27, 29],
+          "action_ids" : [26, 28],
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_36",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_37"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_32",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_33"
           },
           "default_entry" : {
-            "action_id" : 29,
+            "action_id" : 28,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_36",
-          "id" : 60,
+          "name" : "tbl_act_32",
+          "id" : 56,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 236,
+            "line" : 235,
             "column" : 24,
             "source_fragment" : "m_prio.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           },
@@ -17489,25 +17032,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["act_36"],
+          "action_ids" : [89],
+          "actions" : ["act_32"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_36" : null
+            "act_32" : null
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_37",
-          "id" : 61,
+          "name" : "tbl_act_33",
+          "id" : 57,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 239,
+            "line" : 238,
             "column" : 24,
             "source_fragment" : "m_besteff.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           },
@@ -17518,14 +17061,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
-          "actions" : ["act_37"],
+          "action_ids" : [90],
+          "actions" : ["act_33"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_37" : null
+            "act_33" : null
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17533,10 +17076,10 @@
         },
         {
           "name" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
-          "id" : 62,
+          "id" : 58,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 208,
+            "line" : 207,
             "column" : 10,
             "source_fragment" : "t_qos_v6"
           },
@@ -17544,7 +17087,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id29"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id25"],
               "mask" : null
             },
             {
@@ -17566,26 +17109,26 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [28, 30],
+          "action_ids" : [27, 29],
           "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_38",
-            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_39"
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "tbl_act_34",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "tbl_act_35"
           },
           "default_entry" : {
-            "action_id" : 30,
+            "action_id" : 29,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_38",
-          "id" : 63,
+          "name" : "tbl_act_34",
+          "id" : 59,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 248,
+            "line" : 247,
             "column" : 24,
             "source_fragment" : "m_prio.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           },
@@ -17596,25 +17139,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96],
-          "actions" : ["act_38"],
+          "action_ids" : [91],
+          "actions" : ["act_34"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_38" : null
+            "act_34" : null
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_39",
-          "id" : 64,
+          "name" : "tbl_act_35",
+          "id" : 60,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 251,
+            "line" : 250,
             "column" : 24,
             "source_fragment" : "m_besteff.execute_meter(fmeta.bng.line_id, fmeta.bng.ds_meter_result)"
           },
@@ -17625,14 +17168,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
-          "actions" : ["act_39"],
+          "action_ids" : [92],
+          "actions" : ["act_35"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_39" : null
+            "act_35" : null
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17645,7 +17188,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 177,
+            "line" : 179,
             "column" : 57,
             "source_fragment" : "hashed_selector"
           },
@@ -17663,15 +17206,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto20"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto16"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport21"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport17"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport22"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport18"]
               }
             ]
           }
@@ -17783,7 +17326,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 109,
+            "line" : 108,
             "column" : 12,
             "source_fragment" : "hdr.vlan_tag.isValid()"
           },
@@ -17806,7 +17349,7 @@
           "id" : 5,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 115,
+            "line" : 114,
             "column" : 12,
             "source_fragment" : "hdr.inner_vlan_tag.isValid()"
           },
@@ -17829,7 +17372,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 121,
+            "line" : 120,
             "column" : 12,
             "source_fragment" : "!hdr.mpls.isValid()"
           },
@@ -17852,80 +17395,11 @@
             }
           },
           "true_next" : "tbl_act_7",
-          "false_next" : "node_18"
-        },
-        {
-          "name" : "node_18",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 130,
-            "column" : 12,
-            "source_fragment" : "hdr.mpls.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["mpls", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_8",
-          "false_next" : "node_20"
-        },
-        {
-          "name" : "node_20",
-          "id" : 8,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 133,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["vlan_tag", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "node_21",
-          "false_next" : "tbl_act_11"
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
           "name" : "node_21",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 135,
-            "column" : 19,
-            "source_fragment" : "hdr.inner_vlan_tag.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["inner_vlan_tag", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_9",
-          "false_next" : "tbl_act_10"
-        },
-        {
-          "name" : "node_28",
-          "id" : 10,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 144,
@@ -17947,8 +17421,8 @@
           "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
         },
         {
-          "name" : "node_32",
-          "id" : 11,
+          "name" : "node_25",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 148,
@@ -17973,12 +17447,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "tbl_act_16"
+          "true_next" : "tbl_act_11",
+          "false_next" : "tbl_act_12"
         },
         {
-          "name" : "node_39",
-          "id" : 12,
+          "name" : "node_32",
+          "id" : 9,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -17990,12 +17464,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "tbl_act_20"
+          "true_next" : "tbl_act_15",
+          "false_next" : "tbl_act_16"
         },
         {
-          "name" : "node_42",
-          "id" : 13,
+          "name" : "node_35",
+          "id" : 10,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -18014,12 +17488,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_21",
-          "false_next" : "node_44"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_44",
-          "id" : 14,
+          "name" : "node_37",
+          "id" : 11,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 71,
@@ -18037,7 +17511,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding14"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding10"]
                   }
                 }
               },
@@ -18047,15 +17521,15 @@
               }
             }
           },
-          "true_next" : "node_45",
+          "true_next" : "node_38",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_45",
-          "id" : 15,
+          "name" : "node_38",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 141,
+            "line" : 150,
             "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -18065,7 +17539,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type16"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -18074,14 +17548,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_47"
+          "false_next" : "node_40"
         },
         {
-          "name" : "node_47",
-          "id" : 16,
+          "name" : "node_40",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 142,
+            "line" : 151,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -18091,7 +17565,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type16"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -18100,14 +17574,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_49"
+          "false_next" : "node_42"
         },
         {
-          "name" : "node_49",
-          "id" : 17,
+          "name" : "node_42",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 143,
+            "line" : 152,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -18117,7 +17591,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type16"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -18126,14 +17600,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "node_51"
+          "false_next" : "node_44"
         },
         {
-          "name" : "node_51",
-          "id" : 18,
+          "name" : "node_44",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 145,
+            "line" : 154,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
           },
@@ -18143,7 +17617,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._fwd_type16"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type12"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -18155,8 +17629,8 @@
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_54",
-          "id" : 19,
+          "name" : "node_47",
+          "id" : 16,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 75,
@@ -18174,7 +17648,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._skip_next15"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_next11"]
                   }
                 }
               },
@@ -18185,11 +17659,11 @@
             }
           },
           "true_next" : "FabricIngress.next.xconnect",
-          "false_next" : "node_68"
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_60",
-          "id" : 20,
+          "name" : "node_53",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -18210,12 +17684,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_22",
-          "false_next" : "node_62"
+          "true_next" : "tbl_act_18",
+          "false_next" : "node_55"
         },
         {
-          "name" : "node_62",
-          "id" : 21,
+          "name" : "node_55",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -18236,12 +17710,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_23",
+          "true_next" : "tbl_act_19",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_66",
-          "id" : 22,
+          "name" : "node_59",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 86,
@@ -18259,7 +17733,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink34"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink30"]
                   }
                 }
               },
@@ -18269,15 +17743,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
-          "false_next" : "node_68"
+          "true_next" : "tbl_act_20",
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_68",
-          "id" : 23,
+          "name" : "node_61",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 338,
+            "line" : 337,
             "column" : 15,
             "source_fragment" : "hdr.pppoe.isValid()"
           },
@@ -18292,15 +17766,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
-          "false_next" : "tbl_act_26"
+          "true_next" : "tbl_act_21",
+          "false_next" : "tbl_act_22"
         },
         {
-          "name" : "node_72",
-          "id" : 24,
+          "name" : "node_65",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 352,
+            "line" : 351,
             "column" : 16,
             "source_fragment" : "hdr.pppoe.isValid()"
           },
@@ -18315,12 +17789,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
+          "true_next" : "tbl_act_23",
           "false_next" : "FabricIngress.bng_ingress.downstream.t_line_session_map"
         },
         {
-          "name" : "node_77",
-          "id" : 25,
+          "name" : "node_70",
+          "id" : 22,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -18332,12 +17806,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_30",
-          "false_next" : "node_79"
+          "true_next" : "tbl_act_26",
+          "false_next" : "node_72"
         },
         {
-          "name" : "node_79",
-          "id" : 26,
+          "name" : "node_72",
+          "id" : 23,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -18357,14 +17831,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_80"
+          "true_next" : "node_73"
         },
         {
-          "name" : "node_80",
-          "id" : 27,
+          "name" : "node_73",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 126,
+            "line" : 125,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -18380,14 +17854,14 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
-          "false_next" : "node_83"
+          "false_next" : "node_76"
         },
         {
-          "name" : "node_83",
-          "id" : 28,
+          "name" : "node_76",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 134,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "hdr.ipv6.isValid()"
           },
@@ -18403,11 +17877,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_32"
+          "true_next" : "tbl_act_28"
         },
         {
-          "name" : "node_90",
-          "id" : 29,
+          "name" : "node_83",
+          "id" : 26,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -18420,14 +17894,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_91"
+          "true_next" : "node_84"
         },
         {
-          "name" : "node_91",
-          "id" : 30,
+          "name" : "node_84",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 233,
+            "line" : 232,
             "column" : 16,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -18443,14 +17917,14 @@
             }
           },
           "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
-          "false_next" : "node_95"
+          "false_next" : "node_88"
         },
         {
-          "name" : "node_95",
-          "id" : 31,
+          "name" : "node_88",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 245,
+            "line" : 244,
             "column" : 21,
             "source_fragment" : "hdr.ipv6.isValid()"
           },
@@ -18479,11 +17953,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_101",
+      "init_table" : "node_94",
       "tables" : [
         {
-          "name" : "tbl_act_40",
-          "id" : 65,
+          "name" : "tbl_act_36",
+          "id" : 61,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -18497,22 +17971,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [150],
-          "actions" : ["act_40"],
-          "base_default_next" : "node_103",
+          "action_ids" : [145],
+          "actions" : ["act_36"],
+          "base_default_next" : "node_96",
           "next_tables" : {
-            "act_40" : "node_103"
+            "act_36" : "node_96"
           },
           "default_entry" : {
-            "action_id" : 150,
+            "action_id" : 145,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_41",
-          "id" : 66,
+          "name" : "tbl_act_37",
+          "id" : 62,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -18526,25 +18000,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [151],
-          "actions" : ["act_41"],
-          "base_default_next" : "node_105",
+          "action_ids" : [146],
+          "actions" : ["act_37"],
+          "base_default_next" : "node_98",
           "next_tables" : {
-            "act_41" : "node_105"
+            "act_37" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 151,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_42",
-          "id" : 67,
+          "name" : "tbl_act_38",
+          "id" : 63,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 335,
+            "line" : 333,
             "column" : 12,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -18555,14 +18029,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [152],
-          "actions" : ["act_42"],
-          "base_default_next" : "node_107",
+          "action_ids" : [147],
+          "actions" : ["act_38"],
+          "base_default_next" : "node_100",
           "next_tables" : {
-            "act_42" : "node_107"
+            "act_38" : "node_100"
           },
           "default_entry" : {
-            "action_id" : 152,
+            "action_id" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18570,10 +18044,10 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 68,
+          "id" : 64,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 339,
+            "line" : 337,
             "column" : 36,
             "source_fragment" : "pop_mpls_if_present()"
           },
@@ -18584,14 +18058,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [144],
+          "action_ids" : [139],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
-          "base_default_next" : "node_111",
+          "base_default_next" : "node_104",
           "next_tables" : {
-            "FabricEgress.egress_next.pop_mpls_if_present" : "node_111"
+            "FabricEgress.egress_next.pop_mpls_if_present" : "node_104"
           },
           "default_entry" : {
-            "action_id" : 144,
+            "action_id" : 139,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18599,10 +18073,10 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 69,
+          "id" : 65,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 341,
+            "line" : 339,
             "column" : 12,
             "source_fragment" : "set_mpls()"
           },
@@ -18613,14 +18087,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [145],
+          "action_ids" : [140],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
-          "base_default_next" : "node_111",
+          "base_default_next" : "node_104",
           "next_tables" : {
-            "FabricEgress.egress_next.set_mpls" : "node_111"
+            "FabricEgress.egress_next.set_mpls" : "node_104"
           },
           "default_entry" : {
-            "action_id" : 145,
+            "action_id" : 140,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18628,10 +18102,10 @@
         },
         {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 70,
+          "id" : 66,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 347,
+            "line" : 345,
             "column" : 12,
             "source_fragment" : "push_vlan()"
           },
@@ -18642,14 +18116,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [146],
+          "action_ids" : [141],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
           "base_default_next" : "tbl_egress_next_push_inner_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.push_vlan" : "tbl_egress_next_push_inner_vlan"
           },
           "default_entry" : {
-            "action_id" : 146,
+            "action_id" : 141,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18657,10 +18131,10 @@
         },
         {
           "name" : "tbl_egress_next_push_inner_vlan",
-          "id" : 71,
+          "id" : 67,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 348,
+            "line" : 346,
             "column" : 12,
             "source_fragment" : "push_inner_vlan()"
           },
@@ -18671,25 +18145,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
+          "action_ids" : [143],
           "actions" : ["FabricEgress.egress_next.push_inner_vlan"],
-          "base_default_next" : "node_121",
+          "base_default_next" : "node_114",
           "next_tables" : {
-            "FabricEgress.egress_next.push_inner_vlan" : "node_121"
+            "FabricEgress.egress_next.push_inner_vlan" : "node_114"
           },
           "default_entry" : {
-            "action_id" : 148,
+            "action_id" : 143,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_43",
-          "id" : 72,
+          "name" : "tbl_act_39",
+          "id" : 68,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 351,
+            "line" : 349,
             "column" : 12,
             "source_fragment" : "hdr.inner_vlan_tag.setInvalid()"
           },
@@ -18700,14 +18174,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
-          "actions" : ["act_45"],
+          "action_ids" : [150],
+          "actions" : ["act_41"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
-            "act_45" : "FabricEgress.egress_next.egress_vlan"
+            "act_41" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 155,
+            "action_id" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18715,10 +18189,10 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 73,
+          "id" : 69,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 318,
+            "line" : 316,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
@@ -18726,7 +18200,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t._vlan_id5"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id1"],
               "mask" : null
             },
             {
@@ -18742,23 +18216,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149, 101],
+          "action_ids" : [144, 96],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_44",
-            "__MISS__" : "tbl_act_45"
+            "__HIT__" : "tbl_act_40",
+            "__MISS__" : "tbl_act_41"
           },
           "default_entry" : {
-            "action_id" : 101,
+            "action_id" : 96,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_44",
-          "id" : 74,
+          "name" : "tbl_act_40",
+          "id" : 70,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -18766,22 +18240,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
-          "actions" : ["act_43"],
-          "base_default_next" : "node_118",
+          "action_ids" : [148],
+          "actions" : ["act_39"],
+          "base_default_next" : "node_111",
           "next_tables" : {
-            "act_43" : "node_118"
+            "act_39" : "node_111"
           },
           "default_entry" : {
-            "action_id" : 153,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_45",
-          "id" : 75,
+          "name" : "tbl_act_41",
+          "id" : 71,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -18789,14 +18263,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
-          "actions" : ["act_44"],
-          "base_default_next" : "node_118",
+          "action_ids" : [149],
+          "actions" : ["act_40"],
+          "base_default_next" : "node_111",
           "next_tables" : {
-            "act_44" : "node_118"
+            "act_40" : "node_111"
           },
           "default_entry" : {
-            "action_id" : 154,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18804,10 +18278,10 @@
         },
         {
           "name" : "tbl_egress_next_push_vlan_0",
-          "id" : 76,
+          "id" : 72,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 358,
+            "line" : 356,
             "column" : 20,
             "source_fragment" : "push_vlan()"
           },
@@ -18818,25 +18292,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
+          "action_ids" : [142],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_121",
+          "base_default_next" : "node_114",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_121"
+            "FabricEgress.egress_next.push_vlan" : "node_114"
           },
           "default_entry" : {
-            "action_id" : 147,
+            "action_id" : 142,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_46",
-          "id" : 77,
+          "name" : "tbl_act_42",
+          "id" : 73,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 367,
+            "line" : 365,
             "column" : 25,
             "source_fragment" : "="
           },
@@ -18847,25 +18321,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [157],
-          "actions" : ["act_47"],
-          "base_default_next" : "node_123",
+          "action_ids" : [152],
+          "actions" : ["act_43"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "act_47" : "node_123"
+            "act_43" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 157,
+            "action_id" : 152,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_47",
-          "id" : 78,
+          "name" : "tbl_act_43",
+          "id" : 74,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 368,
+            "line" : 366,
             "column" : 35,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -18876,25 +18350,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
-          "actions" : ["act_46"],
-          "base_default_next" : "node_133",
+          "action_ids" : [151],
+          "actions" : ["act_42"],
+          "base_default_next" : "node_126",
           "next_tables" : {
-            "act_46" : "node_133"
+            "act_42" : "node_126"
           },
           "default_entry" : {
-            "action_id" : 156,
+            "action_id" : 151,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_48",
-          "id" : 79,
+          "name" : "tbl_act_44",
+          "id" : 75,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 371,
+            "line" : 369,
             "column" : 29,
             "source_fragment" : "="
           },
@@ -18905,25 +18379,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [159],
-          "actions" : ["act_49"],
-          "base_default_next" : "node_127",
+          "action_ids" : [154],
+          "actions" : ["act_45"],
+          "base_default_next" : "node_120",
           "next_tables" : {
-            "act_49" : "node_127"
+            "act_45" : "node_120"
           },
           "default_entry" : {
-            "action_id" : 159,
+            "action_id" : 154,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_49",
-          "id" : 80,
+          "name" : "tbl_act_45",
+          "id" : 76,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 372,
+            "line" : 370,
             "column" : 39,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -18934,25 +18408,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["act_48"],
-          "base_default_next" : "node_133",
+          "action_ids" : [153],
+          "actions" : ["act_44"],
+          "base_default_next" : "node_126",
           "next_tables" : {
-            "act_48" : "node_133"
+            "act_44" : "node_126"
           },
           "default_entry" : {
-            "action_id" : 158,
+            "action_id" : 153,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_50",
-          "id" : 81,
+          "name" : "tbl_act_46",
+          "id" : 77,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 374,
             "column" : 35,
             "source_fragment" : "="
           },
@@ -18963,25 +18437,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [161],
-          "actions" : ["act_51"],
-          "base_default_next" : "node_131",
+          "action_ids" : [156],
+          "actions" : ["act_47"],
+          "base_default_next" : "node_124",
           "next_tables" : {
-            "act_51" : "node_131"
+            "act_47" : "node_124"
           },
           "default_entry" : {
-            "action_id" : 161,
+            "action_id" : 156,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_51",
-          "id" : 82,
+          "name" : "tbl_act_47",
+          "id" : 78,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 377,
+            "line" : 375,
             "column" : 45,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -18992,14 +18466,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [160],
-          "actions" : ["act_50"],
-          "base_default_next" : "node_133",
+          "action_ids" : [155],
+          "actions" : ["act_46"],
+          "base_default_next" : "node_126",
           "next_tables" : {
-            "act_50" : "node_133"
+            "act_46" : "node_126"
           },
           "default_entry" : {
-            "action_id" : 160,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19007,7 +18481,7 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 83,
+          "id" : 79,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 228,
@@ -19021,14 +18495,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104],
+          "action_ids" : [99],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_135",
+          "base_default_next" : "node_128",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_135"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_128"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 99,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19036,10 +18510,10 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v4",
-          "id" : 84,
+          "id" : 80,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 295,
+            "line" : 294,
             "column" : 12,
             "source_fragment" : "encap_v4()"
           },
@@ -19050,14 +18524,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
+          "action_ids" : [100],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v4"],
-          "base_default_next" : "node_140",
+          "base_default_next" : "node_133",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v4" : "node_140"
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_133"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 100,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19065,10 +18539,10 @@
         },
         {
           "name" : "tbl_bng_egress_downstream_encap_v6",
-          "id" : 85,
+          "id" : 81,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 300,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "encap_v6()"
           },
@@ -19079,14 +18553,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
+          "action_ids" : [101],
           "actions" : ["FabricEgress.bng_egress.downstream.encap_v6"],
-          "base_default_next" : "node_140",
+          "base_default_next" : "node_133",
           "next_tables" : {
-            "FabricEgress.bng_egress.downstream.encap_v6" : "node_140"
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_133"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 101,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19094,7 +18568,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 86,
+          "id" : 82,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -19117,13 +18591,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport21"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport17"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport22"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport18"],
               "mask" : null
             }
           ],
@@ -19133,23 +18607,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107, 98],
+          "action_ids" : [102, 93],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_143",
+          "base_default_next" : "node_136",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_143",
-            "nop" : "node_143"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_136",
+            "nop" : "node_136"
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_52",
-          "id" : 87,
+          "name" : "tbl_act_48",
+          "id" : 83,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -19157,14 +18631,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [162],
-          "actions" : ["act_52"],
+          "action_ids" : [157],
+          "actions" : ["act_48"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_52" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_48" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 162,
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19172,7 +18646,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 88,
+          "id" : 84,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -19193,23 +18667,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108, 99],
+          "action_ids" : [103, 94],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_146",
+          "base_default_next" : "node_139",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_146",
-            "nop" : "node_146"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_139",
+            "nop" : "node_139"
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_53",
-          "id" : 89,
+          "name" : "tbl_act_49",
+          "id" : 85,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -19223,14 +18697,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [163],
-          "actions" : ["act_53"],
-          "base_default_next" : "node_148",
+          "action_ids" : [158],
+          "actions" : ["act_49"],
+          "base_default_next" : "node_141",
           "next_tables" : {
-            "act_53" : "node_148"
+            "act_49" : "node_141"
           },
           "default_entry" : {
-            "action_id" : 163,
+            "action_id" : 158,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19238,7 +18712,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 90,
+          "id" : 86,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -19259,7 +18733,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 102],
+          "action_ids" : [104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 97],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -19282,7 +18756,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 102,
+            "action_id" : 97,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -19302,7 +18776,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 104,
                 "action_data" : []
               },
               "priority" : 1
@@ -19321,7 +18795,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 105,
                 "action_data" : []
               },
               "priority" : 2
@@ -19340,7 +18814,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 106,
                 "action_data" : []
               },
               "priority" : 3
@@ -19359,7 +18833,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 107,
                 "action_data" : []
               },
               "priority" : 4
@@ -19378,7 +18852,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 108,
                 "action_data" : []
               },
               "priority" : 5
@@ -19397,7 +18871,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 109,
                 "action_data" : []
               },
               "priority" : 6
@@ -19416,7 +18890,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 110,
                 "action_data" : []
               },
               "priority" : 7
@@ -19435,7 +18909,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 111,
                 "action_data" : []
               },
               "priority" : 8
@@ -19454,7 +18928,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 112,
                 "action_data" : []
               },
               "priority" : 9
@@ -19473,7 +18947,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 118,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 10
@@ -19492,7 +18966,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 119,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 11
@@ -19511,7 +18985,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 120,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 12
@@ -19530,7 +19004,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 121,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 13
@@ -19549,7 +19023,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 122,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 14
@@ -19568,7 +19042,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 123,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 15
@@ -19587,7 +19061,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 124,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 16
@@ -19596,7 +19070,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 91,
+          "id" : 87,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -19617,30 +19091,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 103],
+          "action_ids" : [120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 98],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_54",
+          "base_default_next" : "tbl_act_50",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_54",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_54",
-            "NoAction" : "tbl_act_54"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_50",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_50",
+            "NoAction" : "tbl_act_50"
           },
           "default_entry" : {
-            "action_id" : 103,
+            "action_id" : 98,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -19660,7 +19134,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 125,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 1
@@ -19679,7 +19153,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 126,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 2
@@ -19698,7 +19172,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 127,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 3
@@ -19717,7 +19191,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 128,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 4
@@ -19736,7 +19210,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 129,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 5
@@ -19755,7 +19229,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 130,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 6
@@ -19774,7 +19248,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 131,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 7
@@ -19793,7 +19267,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 132,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 8
@@ -19812,7 +19286,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 133,
+                "action_id" : 128,
                 "action_data" : []
               },
               "priority" : 9
@@ -19831,7 +19305,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 134,
+                "action_id" : 129,
                 "action_data" : []
               },
               "priority" : 10
@@ -19850,7 +19324,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 135,
+                "action_id" : 130,
                 "action_data" : []
               },
               "priority" : 11
@@ -19869,7 +19343,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 136,
+                "action_id" : 131,
                 "action_data" : []
               },
               "priority" : 12
@@ -19888,7 +19362,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 137,
+                "action_id" : 132,
                 "action_data" : []
               },
               "priority" : 13
@@ -19907,7 +19381,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 138,
+                "action_id" : 133,
                 "action_data" : []
               },
               "priority" : 14
@@ -19926,7 +19400,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 139,
+                "action_id" : 134,
                 "action_data" : []
               },
               "priority" : 15
@@ -19945,7 +19419,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 140,
+                "action_id" : 135,
                 "action_data" : []
               },
               "priority" : 16
@@ -19953,8 +19427,8 @@
           ]
         },
         {
-          "name" : "tbl_act_54",
-          "id" : 92,
+          "name" : "tbl_act_50",
+          "id" : 88,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -19968,22 +19442,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [165],
-          "actions" : ["act_55"],
-          "base_default_next" : "node_152",
+          "action_ids" : [160],
+          "actions" : ["act_51"],
+          "base_default_next" : "node_145",
           "next_tables" : {
-            "act_55" : "node_152"
+            "act_51" : "node_145"
           },
           "default_entry" : {
-            "action_id" : 165,
+            "action_id" : 160,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_55",
-          "id" : 93,
+          "name" : "tbl_act_51",
+          "id" : 89,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -19997,22 +19471,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [164],
-          "actions" : ["act_54"],
-          "base_default_next" : "node_154",
+          "action_ids" : [159],
+          "actions" : ["act_50"],
+          "base_default_next" : "node_147",
           "next_tables" : {
-            "act_54" : "node_154"
+            "act_50" : "node_147"
           },
           "default_entry" : {
-            "action_id" : 164,
+            "action_id" : 159,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_56",
-          "id" : 94,
+          "name" : "tbl_act_52",
+          "id" : 90,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -20026,22 +19500,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [166],
-          "actions" : ["act_56"],
-          "base_default_next" : "node_156",
+          "action_ids" : [161],
+          "actions" : ["act_52"],
+          "base_default_next" : "node_149",
           "next_tables" : {
-            "act_56" : "node_156"
+            "act_52" : "node_149"
           },
           "default_entry" : {
-            "action_id" : 166,
+            "action_id" : 161,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_57",
-          "id" : 95,
+          "name" : "tbl_act_53",
+          "id" : 91,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -20055,14 +19529,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [167],
-          "actions" : ["act_57"],
-          "base_default_next" : "node_158",
+          "action_ids" : [162],
+          "actions" : ["act_53"],
+          "base_default_next" : "node_151",
           "next_tables" : {
-            "act_57" : "node_158"
+            "act_53" : "node_151"
           },
           "default_entry" : {
-            "action_id" : 167,
+            "action_id" : 162,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20070,7 +19544,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 96,
+          "id" : 92,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 86,
@@ -20084,15 +19558,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [141, 100],
+          "action_ids" : [136, 95],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_160",
+          "base_default_next" : "node_153",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_160",
-            "nop" : "node_160"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_153",
+            "nop" : "node_153"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 95,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -20100,7 +19574,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 97,
+          "id" : 93,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -20114,14 +19588,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [142],
+          "action_ids" : [137],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
           "base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
           },
           "default_entry" : {
-            "action_id" : 142,
+            "action_id" : 137,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20129,7 +19603,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 98,
+          "id" : 94,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -20143,14 +19617,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [143],
+          "action_ids" : [138],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 143,
+            "action_id" : 138,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -20160,8 +19634,8 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_101",
-          "id" : 32,
+          "name" : "node_94",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 39,
@@ -20179,7 +19653,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out19"]
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out15"]
                   }
                 }
               },
@@ -20189,12 +19663,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_40",
-          "false_next" : "node_103"
+          "true_next" : "tbl_act_36",
+          "false_next" : "node_96"
         },
         {
-          "name" : "node_103",
-          "id" : 33,
+          "name" : "node_96",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -20215,15 +19689,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_41",
-          "false_next" : "node_105"
+          "true_next" : "tbl_act_37",
+          "false_next" : "node_98"
         },
         {
-          "name" : "node_105",
-          "id" : 34,
+          "name" : "node_98",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 333,
+            "line" : 331,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -20242,7 +19716,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast18"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast14"]
                       }
                     }
                   },
@@ -20268,15 +19742,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_42",
-          "false_next" : "node_107"
+          "true_next" : "tbl_act_38",
+          "false_next" : "node_100"
         },
         {
-          "name" : "node_107",
-          "id" : 35,
+          "name" : "node_100",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 338,
+            "line" : 336,
             "column" : 12,
             "source_fragment" : "fabric_metadata.mpls_label == 0"
           },
@@ -20286,7 +19760,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._mpls_label12"]
+                "value" : ["scalars", "fabric_metadata_t._mpls_label8"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -20294,15 +19768,15 @@
               }
             }
           },
-          "true_next" : "node_108",
+          "true_next" : "node_101",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_108",
-          "id" : 36,
+          "name" : "node_101",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 339,
+            "line" : 337,
             "column" : 16,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -20318,14 +19792,14 @@
             }
           },
           "true_next" : "tbl_egress_next_pop_mpls_if_present",
-          "false_next" : "node_111"
+          "false_next" : "node_104"
         },
         {
-          "name" : "node_111",
-          "id" : 37,
+          "name" : "node_104",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 345,
+            "line" : 343,
             "column" : 12,
             "source_fragment" : "fabric_metadata.push_double_vlan == true"
           },
@@ -20340,7 +19814,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._push_double_vlan8"]
+                    "value" : ["scalars", "fabric_metadata_t._push_double_vlan4"]
                   }
                 }
               },
@@ -20351,14 +19825,14 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "tbl_act_43"
+          "false_next" : "tbl_act_39"
         },
         {
-          "name" : "node_118",
-          "id" : 38,
+          "name" : "node_111",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 355,
+            "line" : 353,
             "column" : 16,
             "source_fragment" : "!egress_vlan.apply().hit"
           },
@@ -20380,15 +19854,15 @@
               }
             }
           },
-          "true_next" : "node_119",
-          "false_next" : "node_121"
+          "true_next" : "node_112",
+          "false_next" : "node_114"
         },
         {
-          "name" : "node_119",
-          "id" : 39,
+          "name" : "node_112",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 357,
+            "line" : 355,
             "column" : 20,
             "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
           },
@@ -20398,7 +19872,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._vlan_id5"]
+                "value" : ["scalars", "fabric_metadata_t._vlan_id1"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -20407,14 +19881,14 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan_0",
-          "false_next" : "node_121"
+          "false_next" : "node_114"
         },
         {
-          "name" : "node_121",
-          "id" : 40,
+          "name" : "node_114",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 366,
+            "line" : 364,
             "column" : 12,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -20429,15 +19903,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_46",
-          "false_next" : "node_125"
+          "true_next" : "tbl_act_42",
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_123",
-          "id" : 41,
+          "name" : "node_116",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 368,
+            "line" : 366,
             "column" : 16,
             "source_fragment" : "hdr.mpls.ttl == 0"
           },
@@ -20455,15 +19929,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_47",
-          "false_next" : "node_133"
+          "true_next" : "tbl_act_43",
+          "false_next" : "node_126"
         },
         {
-          "name" : "node_125",
-          "id" : 42,
+          "name" : "node_118",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 370,
+            "line" : 368,
             "column" : 15,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -20478,15 +19952,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_48",
-          "false_next" : "node_129"
+          "true_next" : "tbl_act_44",
+          "false_next" : "node_122"
         },
         {
-          "name" : "node_127",
-          "id" : 43,
+          "name" : "node_120",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 372,
+            "line" : 370,
             "column" : 20,
             "source_fragment" : "hdr.ipv4.ttl == 0"
           },
@@ -20504,15 +19978,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_49",
-          "false_next" : "node_133"
+          "true_next" : "tbl_act_45",
+          "false_next" : "node_126"
         },
         {
-          "name" : "node_129",
-          "id" : 44,
+          "name" : "node_122",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 375,
+            "line" : 373,
             "column" : 21,
             "source_fragment" : "hdr.ipv6.isValid()"
           },
@@ -20527,15 +20001,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_50",
-          "false_next" : "node_133"
+          "true_next" : "tbl_act_46",
+          "false_next" : "node_126"
         },
         {
-          "name" : "node_131",
-          "id" : 45,
+          "name" : "node_124",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 377,
+            "line" : 375,
             "column" : 20,
             "source_fragment" : "hdr.ipv6.hop_limit == 0"
           },
@@ -20553,12 +20027,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_51",
-          "false_next" : "node_133"
+          "true_next" : "tbl_act_47",
+          "false_next" : "node_126"
         },
         {
-          "name" : "node_133",
-          "id" : 46,
+          "name" : "node_126",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 227,
@@ -20571,7 +20045,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_direction23"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction19"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -20580,14 +20054,14 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_135"
+          "false_next" : "node_128"
         },
         {
-          "name" : "node_135",
-          "id" : 47,
+          "name" : "node_128",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 369,
+            "line" : 368,
             "column" : 12,
             "source_fragment" : "fmeta.bng.type == BNG_TYPE_DOWNSTREAM"
           },
@@ -20597,7 +20071,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type28"]
+                "value" : ["scalars", "fabric_metadata_t._bng_type24"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -20605,15 +20079,15 @@
               }
             }
           },
-          "true_next" : "node_136",
-          "false_next" : "node_140"
+          "true_next" : "node_129",
+          "false_next" : "node_133"
         },
         {
-          "name" : "node_136",
-          "id" : 48,
+          "name" : "node_129",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 294,
+            "line" : 293,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -20629,14 +20103,14 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v4",
-          "false_next" : "node_138"
+          "false_next" : "node_131"
         },
         {
-          "name" : "node_138",
-          "id" : 49,
+          "name" : "node_131",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 299,
+            "line" : 298,
             "column" : 17,
             "source_fragment" : "hdr.ipv6.isValid()"
           },
@@ -20652,11 +20126,11 @@
             }
           },
           "true_next" : "tbl_bng_egress_downstream_encap_v6",
-          "false_next" : "node_140"
+          "false_next" : "node_133"
         },
         {
-          "name" : "node_140",
-          "id" : 50,
+          "name" : "node_133",
+          "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -20732,11 +20206,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_141"
+          "true_next" : "node_134"
         },
         {
-          "name" : "node_141",
-          "id" : 51,
+          "name" : "node_134",
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 106,
@@ -20754,7 +20228,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source32"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source28"]
                   }
                 }
               },
@@ -20765,11 +20239,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_143"
+          "false_next" : "node_136"
         },
         {
-          "name" : "node_143",
-          "id" : 52,
+          "name" : "node_136",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -20788,11 +20262,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_52"
+          "true_next" : "tbl_act_48"
         },
         {
-          "name" : "node_146",
-          "id" : 53,
+          "name" : "node_139",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -20810,7 +20284,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit33"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit29"]
                   }
                 }
               },
@@ -20820,12 +20294,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_53",
-          "false_next" : "node_148"
+          "true_next" : "tbl_act_49",
+          "false_next" : "node_141"
         },
         {
-          "name" : "node_148",
-          "id" : 54,
+          "name" : "node_141",
+          "id" : 51,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -20845,11 +20319,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_158"
+          "false_next" : "node_151"
         },
         {
-          "name" : "node_152",
-          "id" : 55,
+          "name" : "node_145",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -20867,12 +20341,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_55",
-          "false_next" : "node_154"
+          "true_next" : "tbl_act_51",
+          "false_next" : "node_147"
         },
         {
-          "name" : "node_154",
-          "id" : 56,
+          "name" : "node_147",
+          "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -20890,12 +20364,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_56",
-          "false_next" : "node_156"
+          "true_next" : "tbl_act_52",
+          "false_next" : "node_149"
         },
         {
-          "name" : "node_156",
-          "id" : 57,
+          "name" : "node_149",
+          "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -20913,12 +20387,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_57",
-          "false_next" : "node_158"
+          "true_next" : "tbl_act_53",
+          "false_next" : "node_151"
         },
         {
-          "name" : "node_158",
-          "id" : 58,
+          "name" : "node_151",
+          "id" : 55,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 115,
@@ -20940,11 +20414,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_160"
+          "false_next" : "node_153"
         },
         {
-          "name" : "node_160",
-          "id" : 59,
+          "name" : "node_153",
+          "id" : 56,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 119,
@@ -20962,7 +20436,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink34"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink30"]
                   }
                 }
               },