[SDFAB-102] Backport changes required for policies to fabric.p4 (Redirect)

Change-Id: I357c908d31abad9c3f8d74723d937ea948e54808
diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index e7bf0cf..c2a9589 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -46,7 +46,8 @@
         ["userMetadata._int_meta_new_bytes22", 16, false],
         ["userMetadata._int_meta_ig_tstamp23", 32, false],
         ["userMetadata._int_meta_eg_tstamp24", 32, false],
-        ["_padding_0", 3, false]
+        ["userMetadata._port_type25", 2, false],
+        ["_padding_0", 1, false]
       ]
     },
     {
@@ -2122,7 +2123,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 85,
+        "line" : 87,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -2152,9 +2153,33 @@
       }
     },
     {
-      "name" : "FabricIngress.acl.acl_counter",
+      "name" : "FabricIngress.pre_next.next_mpls_counter",
       "id" : 5,
       "is_direct" : true,
+      "binding" : "FabricIngress.pre_next.next_mpls",
+      "source_info" : {
+        "filename" : "include/control/pre_next.p4",
+        "line" : 29,
+        "column" : 50,
+        "source_fragment" : "next_mpls_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.pre_next.next_vlan_counter",
+      "id" : 6,
+      "is_direct" : true,
+      "binding" : "FabricIngress.pre_next.next_vlan",
+      "source_info" : {
+        "filename" : "include/control/pre_next.p4",
+        "line" : 54,
+        "column" : 50,
+        "source_fragment" : "next_vlan_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.acl.acl_counter",
+      "id" : 7,
+      "is_direct" : true,
       "binding" : "FabricIngress.acl.acl",
       "source_info" : {
         "filename" : "include/control/acl.p4",
@@ -2164,56 +2189,44 @@
       }
     },
     {
-      "name" : "FabricIngress.next.next_vlan_counter",
-      "id" : 6,
-      "is_direct" : true,
-      "binding" : "FabricIngress.next.next_vlan",
-      "source_info" : {
-        "filename" : "include/control/next.p4",
-        "line" : 67,
-        "column" : 50,
-        "source_fragment" : "next_vlan_counter"
-      }
-    },
-    {
       "name" : "FabricIngress.next.xconnect_counter",
-      "id" : 7,
+      "id" : 8,
       "is_direct" : true,
       "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 107,
+        "line" : 56,
         "column" : 50,
         "source_fragment" : "xconnect_counter"
       }
     },
     {
       "name" : "FabricIngress.next.hashed_counter",
-      "id" : 8,
+      "id" : 9,
       "is_direct" : true,
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 184,
+        "line" : 126,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
     },
     {
       "name" : "FabricIngress.next.multicast_counter",
-      "id" : 9,
+      "id" : 10,
       "is_direct" : true,
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 228,
+        "line" : 163,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
     },
     {
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
-      "id" : 10,
+      "id" : 11,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 26,
@@ -2225,7 +2238,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 11,
+      "id" : 12,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 27,
@@ -2237,7 +2250,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 12,
+      "id" : 13,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -2249,12 +2262,12 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 13,
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 314,
+        "line" : 248,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -2436,9 +2449,15 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "name" : "nop",
       "id" : 8,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "id" : 9,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
@@ -2473,7 +2492,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 9,
+      "id" : 10,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2533,22 +2552,70 @@
             "column" : 34,
             "source_fragment" : "= true; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._port_type25"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 119,
+            "column" : 38,
+            "source_fragment" : "0x0; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 10,
-      "runtime_data" : [],
-      "primitives" : []
+      "id" : 11,
+      "runtime_data" : [
+        {
+          "name" : "port_type",
+          "bitwidth" : 2
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._port_type25"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 44,
+            "column" : 34,
+            "source_fragment" : "= port_type; ..."
+          }
+        }
+      ]
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 11,
+      "id" : 12,
       "runtime_data" : [
         {
           "name" : "vlan_id",
           "bitwidth" : 12
+        },
+        {
+          "name" : "port_type",
+          "bitwidth" : 2
         }
       ],
       "primitives" : [
@@ -2566,16 +2633,35 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 32,
             "source_fragment" : "= vlan_id; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._port_type25"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 44,
+            "column" : 34,
+            "source_fragment" : "= port_type; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 12,
+      "id" : 13,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2597,7 +2683,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 88,
+            "line" : 90,
             "column" : 33,
             "source_fragment" : "= fwd_type; ..."
           }
@@ -2606,7 +2692,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 13,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2637,7 +2723,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 14,
+      "id" : 15,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2687,7 +2773,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 15,
+      "id" : 16,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2718,13 +2804,75 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 16,
+      "id" : 17,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.pre_next.set_mpls_label",
+      "id" : 18,
+      "runtime_data" : [
+        {
+          "name" : "label",
+          "bitwidth" : 20
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._mpls_label4"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/pre_next.p4",
+            "line" : 32,
+            "column" : 35,
+            "source_fragment" : "= label; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.pre_next.set_vlan",
+      "id" : 19,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._vlan_id1"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/pre_next.p4",
+            "line" : 57,
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.acl.set_next_id_acl",
-      "id" : 17,
+      "id" : 20,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2755,7 +2903,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 18,
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2810,7 +2958,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 19,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -2841,7 +2989,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 20,
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2892,105 +3040,12 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 21,
+      "id" : 24,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.next.set_vlan",
-      "id" : 22,
-      "runtime_data" : [
-        {
-          "name" : "vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._vlan_id1"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 70,
-            "column" : 32,
-            "source_fragment" : "= vlan_id; ..."
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 23,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 31,
-            "column" : 5,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 24,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._next_id9"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 115,
-            "column" : 32,
-            "source_fragment" : "= next_id; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_hashed",
       "id" : 25,
       "runtime_data" : [
         {
@@ -3021,20 +3076,12 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.routing_hashed",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
       "id" : 26,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
+          "name" : "next_id",
+          "bitwidth" : 32
         }
       ],
       "primitives" : [
@@ -3043,39 +3090,32 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "src_addr"]
+              "value" : ["scalars", "userMetadata._next_id9"]
             },
             {
               "type" : "runtime_data",
-              "value" : 1
+              "value" : 0
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 36,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+            "line" : 64,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
-        },
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
+      "id" : 27,
+      "runtime_data" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
         {
           "op" : "assign",
           "parameters" : [
@@ -3098,8 +3138,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 27,
+      "name" : "FabricIngress.next.routing_hashed",
+      "id" : 28,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3112,10 +3152,6 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -3124,25 +3160,6 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "userMetadata._mpls_label4"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 35,
-            "source_fragment" : "= label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -3199,7 +3216,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 28,
+      "id" : 29,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -3221,7 +3238,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 231,
+            "line" : 166,
             "column" : 8,
             "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
@@ -3250,7 +3267,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 232,
+            "line" : 167,
             "column" : 37,
             "source_fragment" : "= true; ..."
           }
@@ -3259,7 +3276,7 @@
     },
     {
       "name" : "packetio25",
-      "id" : 29,
+      "id" : 30,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3338,8 +3355,8 @@
       ]
     },
     {
-      "name" : "filtering111",
-      "id" : 30,
+      "name" : "filtering113",
+      "id" : 31,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3356,7 +3373,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 111,
+            "line" : 113,
             "column" : 36,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
@@ -3375,7 +3392,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 112,
+            "line" : 114,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
@@ -3394,7 +3411,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 113,
+            "line" : 115,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
@@ -3402,8 +3419,8 @@
       ]
     },
     {
-      "name" : "filtering127",
-      "id" : 31,
+      "name" : "filtering129",
+      "id" : 32,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3420,7 +3437,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 127,
+            "line" : 129,
             "column" : 37,
             "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
@@ -3428,8 +3445,8 @@
       ]
     },
     {
-      "name" : "acl101",
-      "id" : 32,
+      "name" : "acl102",
+      "id" : 33,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3446,7 +3463,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 101,
+            "line" : 102,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.inner_tcp.sport"
           }
@@ -3465,7 +3482,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 102,
+            "line" : 103,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.inner_tcp.dport"
           }
@@ -3473,8 +3490,8 @@
       ]
     },
     {
-      "name" : "acl104",
-      "id" : 33,
+      "name" : "acl105",
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3491,7 +3508,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 104,
+            "line" : 105,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.inner_udp.sport"
           }
@@ -3510,7 +3527,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 105,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.inner_udp.dport"
           }
@@ -3518,8 +3535,8 @@
       ]
     },
     {
-      "name" : "acl97",
-      "id" : 34,
+      "name" : "acl98",
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3536,7 +3553,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 97,
+            "line" : 98,
             "column" : 12,
             "source_fragment" : "ipv4_src = hdr.inner_ipv4.src_addr"
           }
@@ -3555,7 +3572,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 98,
+            "line" : 99,
             "column" : 12,
             "source_fragment" : "ipv4_dst = hdr.inner_ipv4.dst_addr"
           }
@@ -3574,7 +3591,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 99,
+            "line" : 100,
             "column" : 12,
             "source_fragment" : "ip_proto = hdr.inner_ipv4.protocol"
           }
@@ -3582,8 +3599,8 @@
       ]
     },
     {
-      "name" : "acl112",
-      "id" : 35,
+      "name" : "acl113",
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3600,7 +3617,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 112,
+            "line" : 113,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.tcp.sport"
           }
@@ -3619,7 +3636,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 113,
+            "line" : 114,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.tcp.dport"
           }
@@ -3627,8 +3644,8 @@
       ]
     },
     {
-      "name" : "acl115",
-      "id" : 36,
+      "name" : "acl116",
+      "id" : 37,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3645,7 +3662,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 115,
+            "line" : 116,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.udp.sport"
           }
@@ -3664,7 +3681,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.udp.dport"
           }
@@ -3672,8 +3689,8 @@
       ]
     },
     {
-      "name" : "acl108",
-      "id" : 37,
+      "name" : "acl109",
+      "id" : 38,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3690,7 +3707,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 108,
+            "line" : 109,
             "column" : 12,
             "source_fragment" : "ipv4_src = hdr.ipv4.src_addr"
           }
@@ -3709,7 +3726,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 109,
+            "line" : 110,
             "column" : 12,
             "source_fragment" : "ipv4_dst = hdr.ipv4.dst_addr"
           }
@@ -3728,7 +3745,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 110,
+            "line" : 111,
             "column" : 12,
             "source_fragment" : "ip_proto = hdr.ipv4.protocol"
           }
@@ -3737,7 +3754,7 @@
     },
     {
       "name" : "acl27",
-      "id" : 38,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3839,7 +3856,7 @@
     },
     {
       "name" : "port_counter31",
-      "id" : 39,
+      "id" : 40,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3897,7 +3914,7 @@
     },
     {
       "name" : "port_counter34",
-      "id" : 40,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3955,18 +3972,12 @@
     },
     {
       "name" : "nop",
-      "id" : 41,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
       "id" : 42,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 43,
       "runtime_data" : [],
       "primitives" : []
@@ -3978,8 +3989,14 @@
       "primitives" : []
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
+      "name" : "NoAction",
       "id" : 45,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
+      "id" : 46,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -4047,7 +4064,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 157,
+            "line" : 169,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -4465,7 +4482,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 153,
+            "line" : 165,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -4474,7 +4491,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 46,
+      "id" : 47,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -4534,13 +4551,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 47,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 48,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4697,7 +4714,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 49,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4822,7 +4839,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 50,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5013,7 +5030,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 51,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5183,7 +5200,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 52,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5419,7 +5436,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 53,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5623,7 +5640,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 54,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5893,7 +5910,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 55,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6018,7 +6035,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 56,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6209,7 +6226,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 57,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6368,7 +6385,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 58,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6593,7 +6610,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 59,
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6797,7 +6814,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 60,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7067,7 +7084,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 61,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7305,7 +7322,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 62,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7609,13 +7626,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 63,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 64,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7740,7 +7757,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 65,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7884,7 +7901,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 66,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8062,7 +8079,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 67,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8210,7 +8227,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 68,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8392,7 +8409,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 69,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8593,7 +8610,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 70,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8828,7 +8845,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 71,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8953,7 +8970,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 72,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9112,7 +9129,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 73,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9290,7 +9307,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 74,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9502,7 +9519,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 75,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9684,7 +9701,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 76,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9900,7 +9917,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 77,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10135,7 +10152,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 78,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10404,7 +10421,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 79,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10417,7 +10434,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 270,
+            "line" : 204,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setInvalid()"
           }
@@ -10436,7 +10453,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "hdr.eth_type.value = fabric_metadata.ip_eth_type; ..."
           }
@@ -10445,7 +10462,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 80,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10458,7 +10475,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 277,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
           }
@@ -10477,7 +10494,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 278,
+            "line" : 212,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
@@ -10496,7 +10513,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 279,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = 3w0"
           }
@@ -10515,7 +10532,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 280,
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
           }
@@ -10534,7 +10551,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 281,
+            "line" : 215,
             "column" : 8,
             "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
@@ -10553,7 +10570,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 118,
+            "line" : 130,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -10562,7 +10579,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 81,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10575,7 +10592,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 289,
+            "line" : 223,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setValid()"
           }
@@ -10594,7 +10611,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 290,
+            "line" : 224,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
@@ -10613,7 +10630,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 291,
+            "line" : 225,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
@@ -10632,7 +10649,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 129,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -10651,7 +10668,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 293,
+            "line" : 227,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
@@ -10660,7 +10677,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 82,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10673,7 +10690,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 322,
+            "line" : 256,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -10682,7 +10699,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.drop",
-      "id" : 83,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10695,7 +10712,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 327,
+            "line" : 261,
             "column" : 8,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -10704,7 +10721,7 @@
     },
     {
       "name" : "packetio41",
-      "id" : 84,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10721,7 +10738,7 @@
     },
     {
       "name" : "packetio44",
-      "id" : 85,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10771,29 +10788,7 @@
       ]
     },
     {
-      "name" : "next349",
-      "id" : 86,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 349,
-            "column" : 12,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "next376",
+      "name" : "next283",
       "id" : 87,
       "runtime_data" : [],
       "primitives" : [
@@ -10807,7 +10802,29 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 283,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "next310",
+      "id" : 88,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
             "column" : 35,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -10815,8 +10832,8 @@
       ]
     },
     {
-      "name" : "next375",
-      "id" : 88,
+      "name" : "next309",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10856,7 +10873,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 375,
+            "line" : 309,
             "column" : 12,
             "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
           }
@@ -10864,8 +10881,8 @@
       ]
     },
     {
-      "name" : "next380",
-      "id" : 89,
+      "name" : "next314",
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10878,7 +10895,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 380,
+            "line" : 314,
             "column" : 39,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -10886,8 +10903,8 @@
       ]
     },
     {
-      "name" : "next379",
-      "id" : 90,
+      "name" : "next313",
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10927,7 +10944,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 379,
+            "line" : 313,
             "column" : 16,
             "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
           }
@@ -10936,7 +10953,7 @@
     },
     {
       "name" : "act",
-      "id" : 91,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10966,7 +10983,7 @@
     },
     {
       "name" : "int_transit420",
-      "id" : 92,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11002,7 +11019,7 @@
     },
     {
       "name" : "int_transit428",
-      "id" : 93,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11051,7 +11068,7 @@
     },
     {
       "name" : "int_transit425",
-      "id" : 94,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11100,7 +11117,7 @@
     },
     {
       "name" : "int_transit431",
-      "id" : 95,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11149,7 +11166,7 @@
     },
     {
       "name" : "int_transit434",
-      "id" : 96,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11203,7 +11220,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 46,
+        "line" : 47,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -11225,25 +11242,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [29],
+          "action_ids" : [30],
           "actions" : ["packetio25"],
           "base_default_next" : "node_4",
           "next_tables" : {
             "packetio25" : "node_4"
           },
           "default_entry" : {
-            "action_id" : 29,
+            "action_id" : 30,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_filtering111",
+          "name" : "tbl_filtering113",
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 111,
+            "line" : 113,
             "column" : 36,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           },
@@ -11254,25 +11271,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [30],
-          "actions" : ["filtering111"],
+          "action_ids" : [31],
+          "actions" : ["filtering113"],
           "base_default_next" : "node_6",
           "next_tables" : {
-            "filtering111" : "node_6"
+            "filtering113" : "node_6"
           },
           "default_entry" : {
-            "action_id" : 30,
+            "action_id" : 31,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_filtering127",
+          "name" : "tbl_filtering129",
           "id" : 2,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 127,
+            "line" : 129,
             "column" : 37,
             "source_fragment" : "="
           },
@@ -11283,14 +11300,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31],
-          "actions" : ["filtering127"],
+          "action_ids" : [32],
+          "actions" : ["filtering129"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
-            "filtering127" : "FabricIngress.filtering.ingress_port_vlan"
+            "filtering129" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 31,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11301,7 +11318,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 53,
+            "line" : 55,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
           },
@@ -11331,7 +11348,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [9, 10, 11],
+          "action_ids" : [10, 11, 12],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -11340,7 +11357,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 10,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11351,7 +11368,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 92,
+            "line" : 94,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
@@ -11387,14 +11404,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12],
+          "action_ids" : [13],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 12,
+            "action_id" : 13,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -11429,12 +11446,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 1],
+          "action_ids" : [14, 1],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
-          "base_default_next" : "tbl_acl27",
+          "base_default_next" : "node_17",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "tbl_acl27",
-            "nop" : "tbl_acl27"
+            "FabricIngress.forwarding.set_next_id_bridging" : "node_17",
+            "nop" : "node_17"
           },
           "default_entry" : {
             "action_id" : 1,
@@ -11466,12 +11483,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 2],
+          "action_ids" : [15, 2],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
-          "base_default_next" : "tbl_acl27",
+          "base_default_next" : "node_17",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_acl27",
-            "nop" : "tbl_acl27"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "node_17",
+            "nop" : "node_17"
           },
           "default_entry" : {
             "action_id" : 2,
@@ -11503,13 +11520,13 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 16, 3],
+          "action_ids" : [16, 17, 3],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
-          "base_default_next" : "tbl_acl27",
+          "base_default_next" : "node_17",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "tbl_acl27",
-            "FabricIngress.forwarding.nop_routing_v4" : "tbl_acl27",
-            "nop" : "tbl_acl27"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "node_17",
+            "FabricIngress.forwarding.nop_routing_v4" : "node_17",
+            "nop" : "node_17"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -11519,9 +11536,83 @@
           }
         },
         {
-          "name" : "tbl_acl27",
+          "name" : "FabricIngress.pre_next.next_mpls",
           "id" : 8,
           "source_info" : {
+            "filename" : "include/control/pre_next.p4",
+            "line" : 36,
+            "column" : 10,
+            "source_fragment" : "next_mpls"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "userMetadata._next_id9"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [18, 4],
+          "actions" : ["FabricIngress.pre_next.set_mpls_label", "nop"],
+          "base_default_next" : "FabricIngress.pre_next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.pre_next.set_mpls_label" : "FabricIngress.pre_next.next_vlan",
+            "nop" : "FabricIngress.pre_next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 4,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.pre_next.next_vlan",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/pre_next.p4",
+            "line" : 73,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "userMetadata._next_id9"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [19, 5],
+          "actions" : ["FabricIngress.pre_next.set_vlan", "nop"],
+          "base_default_next" : "tbl_acl27",
+          "next_tables" : {
+            "FabricIngress.pre_next.set_vlan" : "tbl_acl27",
+            "nop" : "tbl_acl27"
+          },
+          "default_entry" : {
+            "action_id" : 5,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_acl27",
+          "id" : 10,
+          "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 27,
             "column" : 4,
@@ -11534,25 +11625,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
+          "action_ids" : [39],
           "actions" : ["acl27"],
-          "base_default_next" : "node_18",
+          "base_default_next" : "node_21",
           "next_tables" : {
-            "acl27" : "node_18"
+            "acl27" : "node_21"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 39,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl97",
-          "id" : 9,
+          "name" : "tbl_acl98",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 97,
+            "line" : 98,
             "column" : 21,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           },
@@ -11563,25 +11654,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34],
-          "actions" : ["acl97"],
-          "base_default_next" : "node_20",
+          "action_ids" : [35],
+          "actions" : ["acl98"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "acl97" : "node_20"
+            "acl98" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl101",
-          "id" : 10,
+          "name" : "tbl_acl102",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 101,
+            "line" : 102,
             "column" : 25,
             "source_fragment" : "= hdr.inner_tcp.sport; ..."
           },
@@ -11592,25 +11683,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32],
-          "actions" : ["acl101"],
+          "action_ids" : [33],
+          "actions" : ["acl102"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl101" : "FabricIngress.acl.acl"
+            "acl102" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 32,
+            "action_id" : 33,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl104",
-          "id" : 11,
+          "name" : "tbl_acl105",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 104,
+            "line" : 105,
             "column" : 25,
             "source_fragment" : "= hdr.inner_udp.sport; ..."
           },
@@ -11621,25 +11712,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33],
-          "actions" : ["acl104"],
+          "action_ids" : [34],
+          "actions" : ["acl105"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl104" : "FabricIngress.acl.acl"
+            "acl105" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 33,
+            "action_id" : 34,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl108",
-          "id" : 12,
+          "name" : "tbl_acl109",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 108,
+            "line" : 109,
             "column" : 21,
             "source_fragment" : "= hdr.ipv4.src_addr; ..."
           },
@@ -11650,25 +11741,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37],
-          "actions" : ["acl108"],
-          "base_default_next" : "node_26",
+          "action_ids" : [38],
+          "actions" : ["acl109"],
+          "base_default_next" : "node_29",
           "next_tables" : {
-            "acl108" : "node_26"
+            "acl109" : "node_29"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 38,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl112",
-          "id" : 13,
+          "name" : "tbl_acl113",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 112,
+            "line" : 113,
             "column" : 25,
             "source_fragment" : "= hdr.tcp.sport; ..."
           },
@@ -11679,25 +11770,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35],
-          "actions" : ["acl112"],
+          "action_ids" : [36],
+          "actions" : ["acl113"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl112" : "FabricIngress.acl.acl"
+            "acl113" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 35,
+            "action_id" : 36,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl115",
-          "id" : 14,
+          "name" : "tbl_acl116",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 115,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "= hdr.udp.sport; ..."
           },
@@ -11708,14 +11799,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36],
-          "actions" : ["acl115"],
+          "action_ids" : [37],
+          "actions" : ["acl116"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl115" : "FabricIngress.acl.acl"
+            "acl116" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 37,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11723,7 +11814,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 15,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 66,
@@ -11802,6 +11893,12 @@
               "name" : "l4_dport",
               "target" : ["scalars", "acl_l4_dport"],
               "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "port_type",
+              "target" : ["scalars", "userMetadata._port_type25"],
+              "mask" : null
             }
           ],
           "match_type" : "ternary",
@@ -11810,18 +11907,18 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 18, 19, 20, 21],
+          "action_ids" : [20, 21, 22, 23, 24],
           "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_31",
+          "base_default_next" : "node_34",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_31",
-            "FabricIngress.acl.punt_to_cpu" : "node_31",
-            "FabricIngress.acl.set_clone_session_id" : "node_31",
-            "FabricIngress.acl.drop" : "node_31",
-            "FabricIngress.acl.nop_acl" : "node_31"
+            "FabricIngress.acl.set_next_id_acl" : "node_34",
+            "FabricIngress.acl.punt_to_cpu" : "node_34",
+            "FabricIngress.acl.set_clone_session_id" : "node_34",
+            "FabricIngress.acl.drop" : "node_34",
+            "FabricIngress.acl.nop_acl" : "node_34"
           },
           "default_entry" : {
-            "action_id" : 21,
+            "action_id" : 24,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11829,10 +11926,10 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 16,
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 119,
+            "line" : 68,
             "column" : 10,
             "source_fragment" : "xconnect"
           },
@@ -11856,7 +11953,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 24, 5],
+          "action_ids" : [25, 26, 6],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -11865,7 +11962,7 @@
             "nop" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 5,
+            "action_id" : 6,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11873,10 +11970,10 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 17,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 138,
             "column" : 10,
             "source_fragment" : "hashed"
           },
@@ -11895,22 +11992,21 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 26, 27, 6],
-          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "action_ids" : [27, 28, 7],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
             "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
             "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
-            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
             "nop" : "FabricIngress.next.multicast"
           }
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 18,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 236,
+            "line" : 171,
             "column" : 10,
             "source_fragment" : "multicast"
           },
@@ -11928,52 +12024,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [28, 7],
+          "action_ids" : [29, 8],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
-          "base_default_next" : "FabricIngress.next.next_vlan",
+          "base_default_next" : "node_38",
           "next_tables" : {
-            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
-            "nop" : "FabricIngress.next.next_vlan"
+            "FabricIngress.next.set_mcast_group_id" : "node_38",
+            "nop" : "node_38"
           },
           "default_entry" : {
-            "action_id" : 7,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.next_vlan",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 86,
-            "column" : 10,
-            "source_fragment" : "next_vlan"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "next_id",
-              "target" : ["scalars", "userMetadata._next_id9"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [22, 4],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "node_36",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_36",
-            "nop" : "node_36"
-          },
-          "default_entry" : {
-            "action_id" : 4,
+            "action_id" : 8,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11981,7 +12040,7 @@
         },
         {
           "name" : "tbl_port_counter31",
-          "id" : 20,
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -11995,14 +12054,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
+          "action_ids" : [40],
           "actions" : ["port_counter31"],
-          "base_default_next" : "node_38",
+          "base_default_next" : "node_40",
           "next_tables" : {
-            "port_counter31" : "node_38"
+            "port_counter31" : "node_40"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 40,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12010,7 +12069,7 @@
         },
         {
           "name" : "tbl_port_counter34",
-          "id" : 21,
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -12024,14 +12083,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [41],
           "actions" : ["port_counter34"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
             "port_counter34" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12039,7 +12098,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 22,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -12060,7 +12119,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [8, 0],
+          "action_ids" : [9, 0],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
@@ -12081,7 +12140,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 183,
+            "line" : 125,
             "column" : 57,
             "source_fragment" : "hashed_selector"
           },
@@ -12142,7 +12201,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 110,
+            "line" : 112,
             "column" : 12,
             "source_fragment" : "hdr.vlan_tag.isValid()"
           },
@@ -12157,7 +12216,7 @@
               }
             }
           },
-          "true_next" : "tbl_filtering111",
+          "true_next" : "tbl_filtering113",
           "false_next" : "node_6"
         },
         {
@@ -12165,7 +12224,7 @@
           "id" : 2,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 122,
+            "line" : 124,
             "column" : 12,
             "source_fragment" : "!hdr.mpls.isValid()"
           },
@@ -12187,7 +12246,7 @@
               }
             }
           },
-          "true_next" : "tbl_filtering127",
+          "true_next" : "tbl_filtering129",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -12195,7 +12254,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 69,
+            "line" : 71,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding"
           },
@@ -12218,7 +12277,7 @@
             }
           },
           "true_next" : "node_11",
-          "false_next" : "tbl_acl27"
+          "false_next" : "node_17"
         },
         {
           "name" : "node_11",
@@ -12296,14 +12355,44 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
+          "false_next" : "node_17"
+        },
+        {
+          "name" : "node_17",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 74,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "userMetadata._skip_next7"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "FabricIngress.pre_next.next_mpls",
           "false_next" : "tbl_acl27"
         },
         {
-          "name" : "node_18",
-          "id" : 7,
+          "name" : "node_21",
+          "id" : 8,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 96,
+            "line" : 97,
             "column" : 12,
             "source_fragment" : "hdr.gtpu.isValid() && hdr.inner_ipv4.isValid()"
           },
@@ -12335,15 +12424,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl97",
-          "false_next" : "node_24"
+          "true_next" : "tbl_acl98",
+          "false_next" : "node_27"
         },
         {
-          "name" : "node_20",
-          "id" : 8,
+          "name" : "node_23",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 100,
+            "line" : 101,
             "column" : 16,
             "source_fragment" : "hdr.inner_tcp.isValid()"
           },
@@ -12358,15 +12447,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl101",
-          "false_next" : "node_22"
+          "true_next" : "tbl_acl102",
+          "false_next" : "node_25"
         },
         {
-          "name" : "node_22",
-          "id" : 9,
+          "name" : "node_25",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 103,
+            "line" : 104,
             "column" : 23,
             "source_fragment" : "hdr.inner_udp.isValid()"
           },
@@ -12381,15 +12470,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl104",
+          "true_next" : "tbl_acl105",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_24",
-          "id" : 10,
+          "name" : "node_27",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 107,
+            "line" : 108,
             "column" : 19,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -12404,15 +12493,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl108",
+          "true_next" : "tbl_acl109",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_26",
-          "id" : 11,
+          "name" : "node_29",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 111,
+            "line" : 112,
             "column" : 16,
             "source_fragment" : "hdr.tcp.isValid()"
           },
@@ -12427,15 +12516,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl112",
-          "false_next" : "node_28"
+          "true_next" : "tbl_acl113",
+          "false_next" : "node_31"
         },
         {
-          "name" : "node_28",
-          "id" : 12,
+          "name" : "node_31",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 114,
+            "line" : 115,
             "column" : 23,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -12450,15 +12539,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl115",
+          "true_next" : "tbl_acl116",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_31",
-          "id" : 13,
+          "name" : "node_34",
+          "id" : 14,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 73,
+            "line" : 78,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next"
           },
@@ -12484,8 +12573,8 @@
           "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_36",
-          "id" : 14,
+          "name" : "node_38",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -12507,11 +12596,11 @@
             }
           },
           "true_next" : "tbl_port_counter31",
-          "false_next" : "node_38"
+          "false_next" : "node_40"
         },
         {
-          "name" : "node_38",
-          "id" : 15,
+          "name" : "node_40",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -12542,15 +12631,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 91,
+        "line" : 96,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_43",
+      "init_table" : "node_45",
       "tables" : [
         {
           "name" : "tbl_packetio41",
-          "id" : 23,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -12564,14 +12653,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
+          "action_ids" : [85],
           "actions" : ["packetio41"],
-          "base_default_next" : "node_45",
+          "base_default_next" : "node_47",
           "next_tables" : {
-            "packetio41" : "node_45"
+            "packetio41" : "node_47"
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12579,7 +12668,7 @@
         },
         {
           "name" : "tbl_packetio44",
-          "id" : 24,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -12593,25 +12682,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
+          "action_ids" : [86],
           "actions" : ["packetio44"],
-          "base_default_next" : "node_47",
+          "base_default_next" : "node_49",
           "next_tables" : {
-            "packetio44" : "node_47"
+            "packetio44" : "node_49"
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next349",
-          "id" : 25,
+          "name" : "tbl_next283",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 349,
+            "line" : 283,
             "column" : 12,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -12622,14 +12711,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86],
-          "actions" : ["next349"],
-          "base_default_next" : "node_49",
+          "action_ids" : [87],
+          "actions" : ["next283"],
+          "base_default_next" : "node_51",
           "next_tables" : {
-            "next349" : "node_49"
+            "next283" : "node_51"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12637,10 +12726,10 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 26,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 353,
+            "line" : 287,
             "column" : 36,
             "source_fragment" : "pop_mpls_if_present()"
           },
@@ -12651,14 +12740,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79],
+          "action_ids" : [80],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 80,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12666,10 +12755,10 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 27,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 355,
+            "line" : 289,
             "column" : 12,
             "source_fragment" : "set_mpls()"
           },
@@ -12680,14 +12769,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [80],
+          "action_ids" : [81],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 80,
+            "action_id" : 81,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12695,10 +12784,10 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 28,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 331,
+            "line" : 265,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
@@ -12722,27 +12811,27 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81, 82, 83],
+          "action_ids" : [82, 83, 84],
           "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
-          "base_default_next" : "node_54",
+          "base_default_next" : "node_56",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_54",
-            "FabricEgress.egress_next.pop_vlan" : "node_54",
-            "FabricEgress.egress_next.drop" : "node_54"
+            "FabricEgress.egress_next.push_vlan" : "node_56",
+            "FabricEgress.egress_next.pop_vlan" : "node_56",
+            "FabricEgress.egress_next.drop" : "node_56"
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next375",
-          "id" : 29,
+          "name" : "tbl_next309",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 375,
+            "line" : 309,
             "column" : 25,
             "source_fragment" : "="
           },
@@ -12753,25 +12842,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
-          "actions" : ["next375"],
-          "base_default_next" : "node_56",
+          "action_ids" : [89],
+          "actions" : ["next309"],
+          "base_default_next" : "node_58",
           "next_tables" : {
-            "next375" : "node_56"
+            "next309" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next376",
-          "id" : 30,
+          "name" : "tbl_next310",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 310,
             "column" : 35,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -12782,25 +12871,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
-          "actions" : ["next376"],
-          "base_default_next" : "node_62",
+          "action_ids" : [88],
+          "actions" : ["next310"],
+          "base_default_next" : "node_64",
           "next_tables" : {
-            "next376" : "node_62"
+            "next310" : "node_64"
           },
           "default_entry" : {
-            "action_id" : 87,
+            "action_id" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next379",
-          "id" : 31,
+          "name" : "tbl_next313",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 379,
+            "line" : 313,
             "column" : 29,
             "source_fragment" : "="
           },
@@ -12811,25 +12900,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90],
-          "actions" : ["next379"],
-          "base_default_next" : "node_60",
+          "action_ids" : [91],
+          "actions" : ["next313"],
+          "base_default_next" : "node_62",
           "next_tables" : {
-            "next379" : "node_60"
+            "next313" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next380",
-          "id" : 32,
+          "name" : "tbl_next314",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 380,
+            "line" : 314,
             "column" : 39,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -12840,14 +12929,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89],
-          "actions" : ["next380"],
-          "base_default_next" : "node_62",
+          "action_ids" : [90],
+          "actions" : ["next314"],
+          "base_default_next" : "node_64",
           "next_tables" : {
-            "next380" : "node_62"
+            "next314" : "node_64"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12855,7 +12944,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 33,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -12894,15 +12983,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45, 41],
+          "action_ids" : [46, 42],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_65",
+          "base_default_next" : "node_67",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_65",
-            "nop" : "node_65"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_67",
+            "nop" : "node_67"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12910,7 +12999,7 @@
         },
         {
           "name" : "tbl_act",
-          "id" : 34,
+          "id" : 35,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12918,14 +13007,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
+          "action_ids" : [92],
           "actions" : ["act"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
             "act" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12933,7 +13022,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 35,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -12954,15 +13043,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46, 42],
+          "action_ids" : [47, 43],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_68",
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_68",
-            "nop" : "node_68"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_70",
+            "nop" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12970,7 +13059,7 @@
         },
         {
           "name" : "tbl_int_transit420",
-          "id" : 36,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -12984,14 +13073,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
+          "action_ids" : [93],
           "actions" : ["int_transit420"],
-          "base_default_next" : "node_70",
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "int_transit420" : "node_70"
+            "int_transit420" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 93,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12999,7 +13088,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 37,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -13020,7 +13109,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 43],
+          "action_ids" : [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 44],
           "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" : {
@@ -13043,7 +13132,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 44,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13063,7 +13152,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 47,
+                "action_id" : 48,
                 "action_data" : []
               },
               "priority" : 1
@@ -13082,7 +13171,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 48,
+                "action_id" : 49,
                 "action_data" : []
               },
               "priority" : 2
@@ -13101,7 +13190,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 49,
+                "action_id" : 50,
                 "action_data" : []
               },
               "priority" : 3
@@ -13120,7 +13209,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 50,
+                "action_id" : 51,
                 "action_data" : []
               },
               "priority" : 4
@@ -13139,7 +13228,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 51,
+                "action_id" : 52,
                 "action_data" : []
               },
               "priority" : 5
@@ -13158,7 +13247,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 52,
+                "action_id" : 53,
                 "action_data" : []
               },
               "priority" : 6
@@ -13177,7 +13266,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 53,
+                "action_id" : 54,
                 "action_data" : []
               },
               "priority" : 7
@@ -13196,7 +13285,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 54,
+                "action_id" : 55,
                 "action_data" : []
               },
               "priority" : 8
@@ -13215,7 +13304,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 55,
+                "action_id" : 56,
                 "action_data" : []
               },
               "priority" : 9
@@ -13234,7 +13323,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 56,
+                "action_id" : 57,
                 "action_data" : []
               },
               "priority" : 10
@@ -13253,7 +13342,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 57,
+                "action_id" : 58,
                 "action_data" : []
               },
               "priority" : 11
@@ -13272,7 +13361,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 58,
+                "action_id" : 59,
                 "action_data" : []
               },
               "priority" : 12
@@ -13291,7 +13380,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 60,
                 "action_data" : []
               },
               "priority" : 13
@@ -13310,7 +13399,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 60,
+                "action_id" : 61,
                 "action_data" : []
               },
               "priority" : 14
@@ -13329,7 +13418,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 61,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 15
@@ -13348,7 +13437,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 62,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 16
@@ -13357,7 +13446,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 38,
+          "id" : 39,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -13378,7 +13467,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 44],
+          "action_ids" : [64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 45],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
           "base_default_next" : "tbl_int_transit425",
           "next_tables" : {
@@ -13401,7 +13490,7 @@
             "NoAction" : "tbl_int_transit425"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 45,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13421,7 +13510,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 63,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 1
@@ -13440,7 +13529,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 64,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 2
@@ -13459,7 +13548,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 65,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 3
@@ -13478,7 +13567,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 66,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 4
@@ -13497,7 +13586,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 67,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 5
@@ -13516,7 +13605,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 6
@@ -13535,7 +13624,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 7
@@ -13554,7 +13643,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 8
@@ -13573,7 +13662,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 9
@@ -13592,7 +13681,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 10
@@ -13611,7 +13700,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 11
@@ -13630,7 +13719,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 12
@@ -13649,7 +13738,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 13
@@ -13668,7 +13757,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 14
@@ -13687,7 +13776,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 15
@@ -13706,7 +13795,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 16
@@ -13715,7 +13804,7 @@
         },
         {
           "name" : "tbl_int_transit425",
-          "id" : 39,
+          "id" : 40,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -13729,14 +13818,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
+          "action_ids" : [95],
           "actions" : ["int_transit425"],
-          "base_default_next" : "node_74",
+          "base_default_next" : "node_76",
           "next_tables" : {
-            "int_transit425" : "node_74"
+            "int_transit425" : "node_76"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 95,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13744,7 +13833,7 @@
         },
         {
           "name" : "tbl_int_transit428",
-          "id" : 40,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -13758,14 +13847,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
+          "action_ids" : [94],
           "actions" : ["int_transit428"],
-          "base_default_next" : "node_76",
+          "base_default_next" : "node_78",
           "next_tables" : {
-            "int_transit428" : "node_76"
+            "int_transit428" : "node_78"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13773,7 +13862,7 @@
         },
         {
           "name" : "tbl_int_transit431",
-          "id" : 41,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -13787,14 +13876,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
+          "action_ids" : [96],
           "actions" : ["int_transit431"],
-          "base_default_next" : "node_78",
+          "base_default_next" : "node_80",
           "next_tables" : {
-            "int_transit431" : "node_78"
+            "int_transit431" : "node_80"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 96,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13802,7 +13891,7 @@
         },
         {
           "name" : "tbl_int_transit434",
-          "id" : 42,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -13816,14 +13905,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96],
+          "action_ids" : [97],
           "actions" : ["int_transit434"],
           "base_default_next" : null,
           "next_tables" : {
             "int_transit434" : null
           },
           "default_entry" : {
-            "action_id" : 96,
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13833,11 +13922,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_43",
-          "id" : 16,
+          "name" : "node_45",
+          "id" : 17,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 103,
+            "line" : 108,
             "column" : 33,
             "source_fragment" : "fabric_metadata"
           },
@@ -13853,11 +13942,11 @@
             }
           },
           "true_next" : "tbl_packetio41",
-          "false_next" : "node_45"
+          "false_next" : "node_47"
         },
         {
-          "name" : "node_45",
-          "id" : 17,
+          "name" : "node_47",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -13879,14 +13968,14 @@
             }
           },
           "true_next" : "tbl_packetio44",
-          "false_next" : "node_47"
+          "false_next" : "node_49"
         },
         {
-          "name" : "node_47",
-          "id" : 18,
+          "name" : "node_49",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 347,
+            "line" : 281,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -13921,15 +14010,15 @@
               }
             }
           },
-          "true_next" : "tbl_next349",
-          "false_next" : "node_49"
+          "true_next" : "tbl_next283",
+          "false_next" : "node_51"
         },
         {
-          "name" : "node_49",
-          "id" : 19,
+          "name" : "node_51",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 352,
+            "line" : 286,
             "column" : 12,
             "source_fragment" : "fabric_metadata.mpls_label == 0"
           },
@@ -13947,15 +14036,15 @@
               }
             }
           },
-          "true_next" : "node_50",
+          "true_next" : "node_52",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_50",
-          "id" : 20,
+          "name" : "node_52",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 353,
+            "line" : 287,
             "column" : 16,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -13974,11 +14063,11 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_54",
-          "id" : 21,
+          "name" : "node_56",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 374,
+            "line" : 308,
             "column" : 12,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -13993,15 +14082,15 @@
               }
             }
           },
-          "true_next" : "tbl_next375",
-          "false_next" : "node_58"
+          "true_next" : "tbl_next309",
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_56",
-          "id" : 22,
+          "name" : "node_58",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 310,
             "column" : 16,
             "source_fragment" : "hdr.mpls.ttl == 0"
           },
@@ -14019,15 +14108,15 @@
               }
             }
           },
-          "true_next" : "tbl_next376",
-          "false_next" : "node_62"
+          "true_next" : "tbl_next310",
+          "false_next" : "node_64"
         },
         {
-          "name" : "node_58",
-          "id" : 23,
+          "name" : "node_60",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 378,
+            "line" : 312,
             "column" : 15,
             "source_fragment" : "hdr.ipv4.isValid() && fabric_metadata.fwd_type != FWD_BRIDGING"
           },
@@ -14062,15 +14151,15 @@
               }
             }
           },
-          "true_next" : "tbl_next379",
-          "false_next" : "node_62"
+          "true_next" : "tbl_next313",
+          "false_next" : "node_64"
         },
         {
-          "name" : "node_60",
-          "id" : 24,
+          "name" : "node_62",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 380,
+            "line" : 314,
             "column" : 20,
             "source_fragment" : "hdr.ipv4.ttl == 0"
           },
@@ -14088,12 +14177,12 @@
               }
             }
           },
-          "true_next" : "tbl_next380",
-          "false_next" : "node_62"
+          "true_next" : "tbl_next314",
+          "false_next" : "node_64"
         },
         {
-          "name" : "node_62",
-          "id" : 25,
+          "name" : "node_64",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -14169,14 +14258,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_63"
+          "true_next" : "node_65"
         },
         {
-          "name" : "node_63",
-          "id" : 26,
+          "name" : "node_65",
+          "id" : 27,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 112,
+            "line" : 117,
             "column" : 36,
             "source_fragment" : "fabric_metadata"
           },
@@ -14192,11 +14281,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_65"
+          "false_next" : "node_67"
         },
         {
-          "name" : "node_65",
-          "id" : 27,
+          "name" : "node_67",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -14218,8 +14307,8 @@
           "true_next" : "tbl_act"
         },
         {
-          "name" : "node_68",
-          "id" : 28,
+          "name" : "node_70",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -14245,11 +14334,11 @@
             }
           },
           "true_next" : "tbl_int_transit420",
-          "false_next" : "node_70"
+          "false_next" : "node_72"
         },
         {
-          "name" : "node_70",
-          "id" : 29,
+          "name" : "node_72",
+          "id" : 30,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -14272,8 +14361,8 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_74",
-          "id" : 30,
+          "name" : "node_76",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -14292,11 +14381,11 @@
             }
           },
           "true_next" : "tbl_int_transit428",
-          "false_next" : "node_76"
+          "false_next" : "node_78"
         },
         {
-          "name" : "node_76",
-          "id" : 31,
+          "name" : "node_78",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -14315,11 +14404,11 @@
             }
           },
           "true_next" : "tbl_int_transit431",
-          "false_next" : "node_78"
+          "false_next" : "node_80"
         },
         {
-          "name" : "node_78",
-          "id" : 32,
+          "name" : "node_80",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,