[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-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index c420605..d7e5f68 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -61,7 +61,8 @@
         ["userMetadata._int_meta_new_bytes37", 16, false],
         ["userMetadata._int_meta_ig_tstamp38", 32, false],
         ["userMetadata._int_meta_eg_tstamp39", 32, false],
-        ["_padding_0", 6, false]
+        ["userMetadata._port_type40", 2, false],
+        ["_padding_0", 4, false]
       ]
     },
     {
@@ -2184,7 +2185,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 85,
+        "line" : 87,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -2214,9 +2215,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",
@@ -2226,56 +2251,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,
@@ -2287,7 +2300,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 11,
+      "id" : 12,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 27,
@@ -2299,7 +2312,7 @@
     },
     {
       "name" : "FabricIngress.spgw.pdr_counter",
-      "id" : 12,
+      "id" : 13,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
         "line" : 108,
@@ -2311,7 +2324,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 13,
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -2323,19 +2336,19 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 14,
+      "id" : 15,
       "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"
       }
     },
     {
       "name" : "FabricEgress.spgw.pdr_counter",
-      "id" : 15,
+      "id" : 16,
       "source_info" : {
         "filename" : "include/control/spgw.p4",
         "line" : 295,
@@ -2583,7 +2596,7 @@
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 8,
       "runtime_data" : [],
       "primitives" : []
@@ -2595,9 +2608,15 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "name" : "NoAction",
       "id" : 10,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "id" : 11,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
@@ -2632,7 +2651,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 11,
+      "id" : 12,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2692,22 +2711,70 @@
             "column" : 34,
             "source_fragment" : "= true; ..."
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._port_type40"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 119,
+            "column" : 38,
+            "source_fragment" : "0x0; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 12,
-      "runtime_data" : [],
-      "primitives" : []
+      "id" : 13,
+      "runtime_data" : [
+        {
+          "name" : "port_type",
+          "bitwidth" : 2
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._port_type40"]
+            },
+            {
+              "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" : 13,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "vlan_id",
           "bitwidth" : 12
+        },
+        {
+          "name" : "port_type",
+          "bitwidth" : 2
         }
       ],
       "primitives" : [
@@ -2725,16 +2792,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_type40"]
+            },
+            {
+              "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" : 14,
+      "id" : 15,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2756,7 +2842,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 88,
+            "line" : 90,
             "column" : 33,
             "source_fragment" : "= fwd_type; ..."
           }
@@ -2765,7 +2851,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 15,
+      "id" : 16,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2796,7 +2882,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 16,
+      "id" : 17,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2846,7 +2932,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 17,
+      "id" : 18,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2877,13 +2963,75 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 18,
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.pre_next.set_mpls_label",
+      "id" : 20,
+      "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" : 21,
+      "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" : 19,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2914,7 +3062,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 20,
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2969,7 +3117,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 21,
+      "id" : 24,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -3000,7 +3148,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 22,
+      "id" : 25,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3051,105 +3199,12 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 23,
+      "id" : 26,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.next.set_vlan",
-      "id" : 24,
-      "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" : 25,
-      "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" : 26,
-      "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" : 27,
       "runtime_data" : [
         {
@@ -3180,20 +3235,12 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.routing_hashed",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
       "id" : 28,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
+          "name" : "next_id",
+          "bitwidth" : 32
         }
       ],
       "primitives" : [
@@ -3202,39 +3249,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" : 29,
+      "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" : [
@@ -3257,8 +3297,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 29,
+      "name" : "FabricIngress.next.routing_hashed",
+      "id" : 30,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3271,10 +3311,6 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -3283,25 +3319,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"]
             },
             {
@@ -3358,7 +3375,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 30,
+      "id" : 31,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -3380,7 +3397,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 231,
+            "line" : 166,
             "column" : 8,
             "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
@@ -3409,7 +3426,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 232,
+            "line" : 167,
             "column" : 37,
             "source_fragment" : "= true; ..."
           }
@@ -3418,7 +3435,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp",
-      "id" : 31,
+      "id" : 32,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3435,7 +3452,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3637,7 +3654,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp",
-      "id" : 32,
+      "id" : 33,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3654,7 +3671,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3841,7 +3858,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp",
-      "id" : 33,
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3858,7 +3875,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4060,7 +4077,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown",
-      "id" : 34,
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4077,7 +4094,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4245,7 +4262,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_tcp",
-      "id" : 35,
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4262,7 +4279,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4464,7 +4481,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_udp",
-      "id" : 36,
+      "id" : 37,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4481,7 +4498,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4668,7 +4685,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_icmp",
-      "id" : 37,
+      "id" : 38,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4685,7 +4702,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -4887,7 +4904,7 @@
     },
     {
       "name" : "FabricIngress.spgw.decap_gtpu.decap_inner_unknown",
-      "id" : 38,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4904,7 +4921,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 120,
+            "line" : 132,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -5072,7 +5089,7 @@
     },
     {
       "name" : "FabricIngress.spgw.load_iface",
-      "id" : 39,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "src_iface",
@@ -5132,7 +5149,7 @@
     },
     {
       "name" : "FabricIngress.spgw.iface_miss",
-      "id" : 40,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5187,103 +5204,6 @@
     },
     {
       "name" : "FabricIngress.spgw.load_pdr",
-      "id" : 41,
-      "runtime_data" : [
-        {
-          "name" : "ctr_id",
-          "bitwidth" : 32
-        },
-        {
-          "name" : "far_id",
-          "bitwidth" : 32
-        },
-        {
-          "name" : "needs_gtpu_decap",
-          "bitwidth" : 1
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 150,
-            "column" : 30,
-            "source_fragment" : "= ctr_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_far_id25"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 151,
-            "column" : 30,
-            "source_fragment" : "= far_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "!=",
-                      "left" : {
-                        "type" : "local",
-                        "value" : 2
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0x00"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/spgw.p4",
-            "line" : 152,
-            "column" : 40,
-            "source_fragment" : "= (bool)needs_gtpu_decap; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.spgw.load_pdr",
       "id" : 42,
       "runtime_data" : [
         {
@@ -5380,7 +5300,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw.load_pdr_qos",
+      "name" : "FabricIngress.spgw.load_pdr",
       "id" : 43,
       "runtime_data" : [
         {
@@ -5394,10 +5314,6 @@
         {
           "name" : "needs_gtpu_decap",
           "bitwidth" : 1
-        },
-        {
-          "name" : "qid",
-          "bitwidth" : 5
         }
       ],
       "primitives" : [
@@ -5582,10 +5498,111 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw.load_normal_far",
+      "name" : "FabricIngress.spgw.load_pdr_qos",
       "id" : 45,
       "runtime_data" : [
         {
+          "name" : "ctr_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "far_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "needs_gtpu_decap",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "qid",
+          "bitwidth" : 5
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_ctr_id24"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 150,
+            "column" : 30,
+            "source_fragment" : "= ctr_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_far_id25"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 151,
+            "column" : 30,
+            "source_fragment" : "= far_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "userMetadata._spgw_needs_gtpu_decap30"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 2
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/spgw.p4",
+            "line" : 152,
+            "column" : 40,
+            "source_fragment" : "= (bool)needs_gtpu_decap; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw.load_normal_far",
+      "id" : 46,
+      "runtime_data" : [
+        {
           "name" : "drop",
           "bitwidth" : 1
         },
@@ -5716,7 +5733,7 @@
     },
     {
       "name" : "FabricIngress.spgw.load_tunnel_far",
-      "id" : 46,
+      "id" : 47,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -6046,7 +6063,7 @@
     },
     {
       "name" : "FabricIngress.spgw.load_dbuf_far",
-      "id" : 47,
+      "id" : 48,
       "runtime_data" : [
         {
           "name" : "drop",
@@ -6405,7 +6422,7 @@
     },
     {
       "name" : "packetio25",
-      "id" : 48,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6485,7 +6502,7 @@
     },
     {
       "name" : "spgw265",
-      "id" : 49,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6511,7 +6528,7 @@
     },
     {
       "name" : "spgw282",
-      "id" : 50,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6536,8 +6553,8 @@
       ]
     },
     {
-      "name" : "filtering111",
-      "id" : 51,
+      "name" : "filtering113",
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6554,7 +6571,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 111,
+            "line" : 113,
             "column" : 36,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
@@ -6573,7 +6590,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 112,
+            "line" : 114,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
@@ -6592,7 +6609,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 113,
+            "line" : 115,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
@@ -6600,8 +6617,8 @@
       ]
     },
     {
-      "name" : "filtering127",
-      "id" : 52,
+      "name" : "filtering129",
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6618,7 +6635,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 127,
+            "line" : 129,
             "column" : 37,
             "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
@@ -6626,8 +6643,8 @@
       ]
     },
     {
-      "name" : "acl101",
-      "id" : 53,
+      "name" : "acl102",
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6644,7 +6661,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 101,
+            "line" : 102,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.inner_tcp.sport"
           }
@@ -6663,7 +6680,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 102,
+            "line" : 103,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.inner_tcp.dport"
           }
@@ -6671,8 +6688,8 @@
       ]
     },
     {
-      "name" : "acl104",
-      "id" : 54,
+      "name" : "acl105",
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6689,7 +6706,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 104,
+            "line" : 105,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.inner_udp.sport"
           }
@@ -6708,7 +6725,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 105,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.inner_udp.dport"
           }
@@ -6716,8 +6733,8 @@
       ]
     },
     {
-      "name" : "acl97",
-      "id" : 55,
+      "name" : "acl98",
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6734,7 +6751,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 97,
+            "line" : 98,
             "column" : 12,
             "source_fragment" : "ipv4_src = hdr.inner_ipv4.src_addr"
           }
@@ -6753,7 +6770,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 98,
+            "line" : 99,
             "column" : 12,
             "source_fragment" : "ipv4_dst = hdr.inner_ipv4.dst_addr"
           }
@@ -6772,7 +6789,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 99,
+            "line" : 100,
             "column" : 12,
             "source_fragment" : "ip_proto = hdr.inner_ipv4.protocol"
           }
@@ -6780,8 +6797,8 @@
       ]
     },
     {
-      "name" : "acl112",
-      "id" : 56,
+      "name" : "acl113",
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6798,7 +6815,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 112,
+            "line" : 113,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.tcp.sport"
           }
@@ -6817,7 +6834,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 113,
+            "line" : 114,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.tcp.dport"
           }
@@ -6825,8 +6842,8 @@
       ]
     },
     {
-      "name" : "acl115",
-      "id" : 57,
+      "name" : "acl116",
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6843,7 +6860,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 115,
+            "line" : 116,
             "column" : 16,
             "source_fragment" : "l4_sport = hdr.udp.sport"
           }
@@ -6862,7 +6879,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 116,
+            "line" : 117,
             "column" : 16,
             "source_fragment" : "l4_dport = hdr.udp.dport"
           }
@@ -6870,8 +6887,8 @@
       ]
     },
     {
-      "name" : "acl108",
-      "id" : 58,
+      "name" : "acl109",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6888,7 +6905,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 108,
+            "line" : 109,
             "column" : 12,
             "source_fragment" : "ipv4_src = hdr.ipv4.src_addr"
           }
@@ -6907,7 +6924,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 109,
+            "line" : 110,
             "column" : 12,
             "source_fragment" : "ipv4_dst = hdr.ipv4.dst_addr"
           }
@@ -6926,7 +6943,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 110,
+            "line" : 111,
             "column" : 12,
             "source_fragment" : "ip_proto = hdr.ipv4.protocol"
           }
@@ -6935,7 +6952,7 @@
     },
     {
       "name" : "acl27",
-      "id" : 59,
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7037,7 +7054,7 @@
     },
     {
       "name" : "port_counter31",
-      "id" : 60,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7095,7 +7112,7 @@
     },
     {
       "name" : "port_counter34",
-      "id" : 61,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7153,18 +7170,12 @@
     },
     {
       "name" : "nop",
-      "id" : 62,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
       "id" : 63,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 64,
       "runtime_data" : [],
       "primitives" : []
@@ -7176,8 +7187,14 @@
       "primitives" : []
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
+      "name" : "NoAction",
       "id" : 66,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
+      "id" : 67,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -7245,7 +7262,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 157,
+            "line" : 169,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -7663,7 +7680,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 153,
+            "line" : 165,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -7672,7 +7689,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 67,
+      "id" : 68,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -7732,13 +7749,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 68,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 69,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7895,7 +7912,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 70,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8020,7 +8037,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 71,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8211,7 +8228,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 72,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8381,7 +8398,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 73,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8617,7 +8634,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 74,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8821,7 +8838,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 75,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9091,7 +9108,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 76,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9216,7 +9233,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 77,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9407,7 +9424,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 78,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9566,7 +9583,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 79,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9791,7 +9808,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 80,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9995,7 +10012,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 81,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10265,7 +10282,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 82,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10503,7 +10520,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 83,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10807,13 +10824,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 84,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 85,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10938,7 +10955,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 86,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11082,7 +11099,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 87,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11260,7 +11277,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 88,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11408,7 +11425,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 89,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11590,7 +11607,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 90,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11791,7 +11808,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 91,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12026,7 +12043,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 92,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12151,7 +12168,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 93,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12310,7 +12327,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 94,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12488,7 +12505,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 95,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12700,7 +12717,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 96,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12882,7 +12899,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 97,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13098,7 +13115,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 98,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13333,7 +13350,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 99,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13602,7 +13619,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 100,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13615,7 +13632,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 270,
+            "line" : 204,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setInvalid()"
           }
@@ -13634,7 +13651,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; ..."
           }
@@ -13643,7 +13660,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 101,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13656,7 +13673,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 277,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
           }
@@ -13675,7 +13692,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 278,
+            "line" : 212,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
@@ -13694,7 +13711,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 279,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = 3w0"
           }
@@ -13713,7 +13730,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 280,
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
           }
@@ -13732,7 +13749,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. ..."
           }
@@ -13751,7 +13768,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 118,
+            "line" : 130,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -13760,7 +13777,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 102,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13773,7 +13790,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 289,
+            "line" : 223,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setValid()"
           }
@@ -13792,7 +13809,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 290,
+            "line" : 224,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
@@ -13811,7 +13828,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 291,
+            "line" : 225,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
@@ -13830,7 +13847,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 129,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -13849,7 +13866,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; ..."
           }
@@ -13858,7 +13875,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 103,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13871,7 +13888,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 322,
+            "line" : 256,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -13880,7 +13897,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.drop",
-      "id" : 104,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13893,7 +13910,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 327,
+            "line" : 261,
             "column" : 8,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -13902,7 +13919,7 @@
     },
     {
       "name" : "FabricEgress.spgw.gtpu_encap",
-      "id" : 105,
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13953,7 +13970,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 147,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -14109,7 +14126,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 148,
+            "line" : 160,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -14128,7 +14145,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 144,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -14494,7 +14511,7 @@
     },
     {
       "name" : "packetio41",
-      "id" : 106,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14511,7 +14528,7 @@
     },
     {
       "name" : "packetio44",
-      "id" : 107,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14561,29 +14578,7 @@
       ]
     },
     {
-      "name" : "next349",
-      "id" : 108,
-      "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" : 109,
       "runtime_data" : [],
       "primitives" : [
@@ -14597,7 +14592,29 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 283,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "next310",
+      "id" : 110,
+      "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)"
           }
@@ -14605,8 +14622,8 @@
       ]
     },
     {
-      "name" : "next375",
-      "id" : 110,
+      "name" : "next309",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14646,7 +14663,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 375,
+            "line" : 309,
             "column" : 12,
             "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
           }
@@ -14654,8 +14671,8 @@
       ]
     },
     {
-      "name" : "next380",
-      "id" : 111,
+      "name" : "next314",
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14668,7 +14685,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 380,
+            "line" : 314,
             "column" : 39,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -14676,8 +14693,8 @@
       ]
     },
     {
-      "name" : "next379",
-      "id" : 112,
+      "name" : "next313",
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14717,7 +14734,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 379,
+            "line" : 313,
             "column" : 16,
             "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
           }
@@ -14726,7 +14743,7 @@
     },
     {
       "name" : "spgw342",
-      "id" : 113,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14752,7 +14769,7 @@
     },
     {
       "name" : "act",
-      "id" : 114,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14782,7 +14799,7 @@
     },
     {
       "name" : "int_transit420",
-      "id" : 115,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14818,7 +14835,7 @@
     },
     {
       "name" : "int_transit428",
-      "id" : 116,
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14867,7 +14884,7 @@
     },
     {
       "name" : "int_transit425",
-      "id" : 117,
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14916,7 +14933,7 @@
     },
     {
       "name" : "int_transit431",
-      "id" : 118,
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -14965,7 +14982,7 @@
     },
     {
       "name" : "int_transit434",
-      "id" : 119,
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15019,7 +15036,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 46,
+        "line" : 47,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -15041,14 +15058,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [49],
           "actions" : ["packetio25"],
           "base_default_next" : "FabricIngress.spgw.interfaces",
           "next_tables" : {
             "packetio25" : "FabricIngress.spgw.interfaces"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15083,7 +15100,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39, 40],
+          "action_ids" : [40, 41],
           "actions" : ["FabricIngress.spgw.load_iface", "FabricIngress.spgw.iface_miss"],
           "base_default_next" : null,
           "next_tables" : {
@@ -15091,7 +15108,7 @@
             "__MISS__" : "node_16"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15132,7 +15149,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31, 32, 33, 34],
+          "action_ids" : [32, 33, 34, 35],
           "actions" : ["FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_udp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown"],
           "base_default_next" : "node_7",
           "next_tables" : {
@@ -15142,7 +15159,7 @@
             "FabricIngress.spgw.decap_gtpu_from_dbuf.decap_inner_unknown" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15170,7 +15187,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 31,
+                "action_id" : 32,
                 "action_data" : []
               },
               "priority" : 1
@@ -15197,7 +15214,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 32,
+                "action_id" : 33,
                 "action_data" : []
               },
               "priority" : 2
@@ -15224,7 +15241,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 33,
+                "action_id" : 34,
                 "action_data" : []
               },
               "priority" : 3
@@ -15260,7 +15277,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42, 44, 9],
+          "action_ids" : [43, 45, 10],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
           "base_default_next" : "node_10",
           "next_tables" : {
@@ -15269,7 +15286,7 @@
             "NoAction" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 10,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -15298,7 +15315,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41, 43, 8],
+          "action_ids" : [42, 44, 9],
           "actions" : ["FabricIngress.spgw.load_pdr", "FabricIngress.spgw.load_pdr_qos", "NoAction"],
           "base_default_next" : "node_10",
           "next_tables" : {
@@ -15307,7 +15324,7 @@
             "NoAction" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 8,
+            "action_id" : 9,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -15329,14 +15346,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
+          "action_ids" : [50],
           "actions" : ["spgw265"],
           "base_default_next" : "node_12",
           "next_tables" : {
             "spgw265" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15377,7 +15394,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35, 36, 37, 38],
+          "action_ids" : [36, 37, 38, 39],
           "actions" : ["FabricIngress.spgw.decap_gtpu.decap_inner_tcp", "FabricIngress.spgw.decap_gtpu.decap_inner_udp", "FabricIngress.spgw.decap_gtpu.decap_inner_icmp", "FabricIngress.spgw.decap_gtpu.decap_inner_unknown"],
           "base_default_next" : "FabricIngress.spgw.fars",
           "next_tables" : {
@@ -15387,7 +15404,7 @@
             "FabricIngress.spgw.decap_gtpu.decap_inner_unknown" : "FabricIngress.spgw.fars"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 39,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15415,7 +15432,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 35,
+                "action_id" : 36,
                 "action_data" : []
               },
               "priority" : 1
@@ -15442,7 +15459,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 36,
+                "action_id" : 37,
                 "action_data" : []
               },
               "priority" : 2
@@ -15469,7 +15486,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 37,
+                "action_id" : 38,
                 "action_data" : []
               },
               "priority" : 3
@@ -15499,7 +15516,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45, 46, 47],
+          "action_ids" : [46, 47, 48],
           "actions" : ["FabricIngress.spgw.load_normal_far", "FabricIngress.spgw.load_tunnel_far", "FabricIngress.spgw.load_dbuf_far"],
           "base_default_next" : "tbl_spgw282",
           "next_tables" : {
@@ -15508,7 +15525,7 @@
             "FabricIngress.spgw.load_dbuf_far" : "tbl_spgw282"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : ["0x1", "0x0"],
             "action_entry_const" : true
@@ -15530,25 +15547,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
+          "action_ids" : [51],
           "actions" : ["spgw282"],
           "base_default_next" : "node_16",
           "next_tables" : {
             "spgw282" : "node_16"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_filtering111",
+          "name" : "tbl_filtering113",
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 111,
+            "line" : 113,
             "column" : 36,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           },
@@ -15559,25 +15576,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["filtering111"],
+          "action_ids" : [52],
+          "actions" : ["filtering113"],
           "base_default_next" : "node_18",
           "next_tables" : {
-            "filtering111" : "node_18"
+            "filtering113" : "node_18"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_filtering127",
+          "name" : "tbl_filtering129",
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 127,
+            "line" : 129,
             "column" : 37,
             "source_fragment" : "="
           },
@@ -15588,14 +15605,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["filtering127"],
+          "action_ids" : [53],
+          "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" : 52,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15606,7 +15623,7 @@
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 53,
+            "line" : 55,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
           },
@@ -15636,7 +15653,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11, 12, 13],
+          "action_ids" : [12, 13, 14],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -15645,7 +15662,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 11,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15656,7 +15673,7 @@
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 92,
+            "line" : 94,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
@@ -15692,14 +15709,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14],
+          "action_ids" : [15],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_22",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_22"
           },
           "default_entry" : {
-            "action_id" : 14,
+            "action_id" : 15,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -15734,12 +15751,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 1],
+          "action_ids" : [16, 1],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
-          "base_default_next" : "tbl_acl27",
+          "base_default_next" : "node_29",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "tbl_acl27",
-            "nop" : "tbl_acl27"
+            "FabricIngress.forwarding.set_next_id_bridging" : "node_29",
+            "nop" : "node_29"
           },
           "default_entry" : {
             "action_id" : 1,
@@ -15771,12 +15788,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 2],
+          "action_ids" : [17, 2],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
-          "base_default_next" : "tbl_acl27",
+          "base_default_next" : "node_29",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_acl27",
-            "nop" : "tbl_acl27"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "node_29",
+            "nop" : "node_29"
           },
           "default_entry" : {
             "action_id" : 2,
@@ -15808,13 +15825,13 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 18, 3],
+          "action_ids" : [18, 19, 3],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
-          "base_default_next" : "tbl_acl27",
+          "base_default_next" : "node_29",
           "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_29",
+            "FabricIngress.forwarding.nop_routing_v4" : "node_29",
+            "nop" : "node_29"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -15824,9 +15841,83 @@
           }
         },
         {
-          "name" : "tbl_acl27",
+          "name" : "FabricIngress.pre_next.next_mpls",
           "id" : 16,
           "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" : [20, 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" : 17,
+          "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" : [21, 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" : 18,
+          "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 27,
             "column" : 4,
@@ -15839,25 +15930,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
+          "action_ids" : [60],
           "actions" : ["acl27"],
-          "base_default_next" : "node_30",
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "acl27" : "node_30"
+            "acl27" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl97",
-          "id" : 17,
+          "name" : "tbl_acl98",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 97,
+            "line" : 98,
             "column" : 21,
             "source_fragment" : "= hdr.inner_ipv4.src_addr; ..."
           },
@@ -15868,25 +15959,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["acl97"],
-          "base_default_next" : "node_32",
+          "action_ids" : [56],
+          "actions" : ["acl98"],
+          "base_default_next" : "node_35",
           "next_tables" : {
-            "acl97" : "node_32"
+            "acl98" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl101",
-          "id" : 18,
+          "name" : "tbl_acl102",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 101,
+            "line" : 102,
             "column" : 25,
             "source_fragment" : "= hdr.inner_tcp.sport; ..."
           },
@@ -15897,25 +15988,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["acl101"],
+          "action_ids" : [54],
+          "actions" : ["acl102"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl101" : "FabricIngress.acl.acl"
+            "acl102" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl104",
-          "id" : 19,
+          "name" : "tbl_acl105",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 104,
+            "line" : 105,
             "column" : 25,
             "source_fragment" : "= hdr.inner_udp.sport; ..."
           },
@@ -15926,25 +16017,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["acl104"],
+          "action_ids" : [55],
+          "actions" : ["acl105"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl104" : "FabricIngress.acl.acl"
+            "acl105" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl108",
-          "id" : 20,
+          "name" : "tbl_acl109",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 108,
+            "line" : 109,
             "column" : 21,
             "source_fragment" : "= hdr.ipv4.src_addr; ..."
           },
@@ -15955,25 +16046,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["acl108"],
-          "base_default_next" : "node_38",
+          "action_ids" : [59],
+          "actions" : ["acl109"],
+          "base_default_next" : "node_41",
           "next_tables" : {
-            "acl108" : "node_38"
+            "acl109" : "node_41"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl112",
-          "id" : 21,
+          "name" : "tbl_acl113",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 112,
+            "line" : 113,
             "column" : 25,
             "source_fragment" : "= hdr.tcp.sport; ..."
           },
@@ -15984,25 +16075,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["acl112"],
+          "action_ids" : [57],
+          "actions" : ["acl113"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl112" : "FabricIngress.acl.acl"
+            "acl113" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_acl115",
-          "id" : 22,
+          "name" : "tbl_acl116",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 115,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "= hdr.udp.sport; ..."
           },
@@ -16013,14 +16104,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
-          "actions" : ["acl115"],
+          "action_ids" : [58],
+          "actions" : ["acl116"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "acl115" : "FabricIngress.acl.acl"
+            "acl116" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16028,7 +16119,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 23,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 66,
@@ -16107,6 +16198,12 @@
               "name" : "l4_dport",
               "target" : ["scalars", "acl_l4_dport"],
               "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "port_type",
+              "target" : ["scalars", "userMetadata._port_type40"],
+              "mask" : null
             }
           ],
           "match_type" : "ternary",
@@ -16115,18 +16212,18 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 20, 21, 22, 23],
+          "action_ids" : [22, 23, 24, 25, 26],
           "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_43",
+          "base_default_next" : "node_46",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_43",
-            "FabricIngress.acl.punt_to_cpu" : "node_43",
-            "FabricIngress.acl.set_clone_session_id" : "node_43",
-            "FabricIngress.acl.drop" : "node_43",
-            "FabricIngress.acl.nop_acl" : "node_43"
+            "FabricIngress.acl.set_next_id_acl" : "node_46",
+            "FabricIngress.acl.punt_to_cpu" : "node_46",
+            "FabricIngress.acl.set_clone_session_id" : "node_46",
+            "FabricIngress.acl.drop" : "node_46",
+            "FabricIngress.acl.nop_acl" : "node_46"
           },
           "default_entry" : {
-            "action_id" : 23,
+            "action_id" : 26,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16134,10 +16231,10 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 24,
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 119,
+            "line" : 68,
             "column" : 10,
             "source_fragment" : "xconnect"
           },
@@ -16161,7 +16258,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 26, 5],
+          "action_ids" : [27, 28, 6],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -16170,7 +16267,7 @@
             "nop" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 5,
+            "action_id" : 6,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16178,10 +16275,10 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 25,
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 138,
             "column" : 10,
             "source_fragment" : "hashed"
           },
@@ -16200,22 +16297,21 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27, 28, 29, 6],
-          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "action_ids" : [29, 30, 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" : 26,
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 236,
+            "line" : 171,
             "column" : 10,
             "source_fragment" : "multicast"
           },
@@ -16233,52 +16329,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [30, 7],
+          "action_ids" : [31, 8],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
-          "base_default_next" : "FabricIngress.next.next_vlan",
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
-            "nop" : "FabricIngress.next.next_vlan"
+            "FabricIngress.next.set_mcast_group_id" : "node_50",
+            "nop" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 7,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.next_vlan",
-          "id" : 27,
-          "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" : [24, 4],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "node_48",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_48",
-            "nop" : "node_48"
-          },
-          "default_entry" : {
-            "action_id" : 4,
+            "action_id" : 8,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16286,7 +16345,7 @@
         },
         {
           "name" : "tbl_port_counter31",
-          "id" : 28,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -16300,14 +16359,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
+          "action_ids" : [61],
           "actions" : ["port_counter31"],
-          "base_default_next" : "node_50",
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "port_counter31" : "node_50"
+            "port_counter31" : "node_52"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16315,7 +16374,7 @@
         },
         {
           "name" : "tbl_port_counter34",
-          "id" : 29,
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -16329,14 +16388,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
+          "action_ids" : [62],
           "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" : 61,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16344,7 +16403,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 30,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -16365,7 +16424,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [10, 0],
+          "action_ids" : [11, 0],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
@@ -16386,7 +16445,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 183,
+            "line" : 125,
             "column" : 57,
             "source_fragment" : "hashed_selector"
           },
@@ -16522,7 +16581,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 66,
+            "line" : 68,
             "column" : 24,
             "source_fragment" : "fabric_metadata"
           },
@@ -16545,7 +16604,7 @@
           "id" : 5,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 110,
+            "line" : 112,
             "column" : 12,
             "source_fragment" : "hdr.vlan_tag.isValid()"
           },
@@ -16560,7 +16619,7 @@
               }
             }
           },
-          "true_next" : "tbl_filtering111",
+          "true_next" : "tbl_filtering113",
           "false_next" : "node_18"
         },
         {
@@ -16568,7 +16627,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 122,
+            "line" : 124,
             "column" : 12,
             "source_fragment" : "!hdr.mpls.isValid()"
           },
@@ -16590,7 +16649,7 @@
               }
             }
           },
-          "true_next" : "tbl_filtering127",
+          "true_next" : "tbl_filtering129",
           "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
@@ -16598,7 +16657,7 @@
           "id" : 7,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 69,
+            "line" : 71,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding"
           },
@@ -16621,7 +16680,7 @@
             }
           },
           "true_next" : "node_23",
-          "false_next" : "tbl_acl27"
+          "false_next" : "node_29"
         },
         {
           "name" : "node_23",
@@ -16699,14 +16758,44 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
+          "false_next" : "node_29"
+        },
+        {
+          "name" : "node_29",
+          "id" : 11,
+          "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_30",
-          "id" : 11,
+          "name" : "node_33",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 96,
+            "line" : 97,
             "column" : 12,
             "source_fragment" : "hdr.gtpu.isValid() && hdr.inner_ipv4.isValid()"
           },
@@ -16738,15 +16827,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl97",
-          "false_next" : "node_36"
+          "true_next" : "tbl_acl98",
+          "false_next" : "node_39"
         },
         {
-          "name" : "node_32",
-          "id" : 12,
+          "name" : "node_35",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 100,
+            "line" : 101,
             "column" : 16,
             "source_fragment" : "hdr.inner_tcp.isValid()"
           },
@@ -16761,15 +16850,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl101",
-          "false_next" : "node_34"
+          "true_next" : "tbl_acl102",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_34",
-          "id" : 13,
+          "name" : "node_37",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 103,
+            "line" : 104,
             "column" : 23,
             "source_fragment" : "hdr.inner_udp.isValid()"
           },
@@ -16784,15 +16873,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl104",
+          "true_next" : "tbl_acl105",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_36",
-          "id" : 14,
+          "name" : "node_39",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 107,
+            "line" : 108,
             "column" : 19,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -16807,15 +16896,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl108",
+          "true_next" : "tbl_acl109",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_38",
-          "id" : 15,
+          "name" : "node_41",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 111,
+            "line" : 112,
             "column" : 16,
             "source_fragment" : "hdr.tcp.isValid()"
           },
@@ -16830,15 +16919,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl112",
-          "false_next" : "node_40"
+          "true_next" : "tbl_acl113",
+          "false_next" : "node_43"
         },
         {
-          "name" : "node_40",
-          "id" : 16,
+          "name" : "node_43",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/acl.p4",
-            "line" : 114,
+            "line" : 115,
             "column" : 23,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -16853,15 +16942,15 @@
               }
             }
           },
-          "true_next" : "tbl_acl115",
+          "true_next" : "tbl_acl116",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_43",
-          "id" : 17,
+          "name" : "node_46",
+          "id" : 18,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 73,
+            "line" : 78,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next"
           },
@@ -16887,8 +16976,8 @@
           "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_48",
-          "id" : 18,
+          "name" : "node_50",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -16910,11 +16999,11 @@
             }
           },
           "true_next" : "tbl_port_counter31",
-          "false_next" : "node_50"
+          "false_next" : "node_52"
         },
         {
-          "name" : "node_50",
-          "id" : 19,
+          "name" : "node_52",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -16945,15 +17034,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 91,
+        "line" : 96,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_55",
+      "init_table" : "node_57",
       "tables" : [
         {
           "name" : "tbl_packetio41",
-          "id" : 31,
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -16967,14 +17056,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
+          "action_ids" : [107],
           "actions" : ["packetio41"],
-          "base_default_next" : "node_57",
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "packetio41" : "node_57"
+            "packetio41" : "node_59"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16982,7 +17071,7 @@
         },
         {
           "name" : "tbl_packetio44",
-          "id" : 32,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -16996,25 +17085,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
+          "action_ids" : [108],
           "actions" : ["packetio44"],
-          "base_default_next" : "node_59",
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "packetio44" : "node_59"
+            "packetio44" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 107,
+            "action_id" : 108,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next349",
-          "id" : 33,
+          "name" : "tbl_next283",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 349,
+            "line" : 283,
             "column" : 12,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -17025,14 +17114,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
-          "actions" : ["next349"],
-          "base_default_next" : "node_61",
+          "action_ids" : [109],
+          "actions" : ["next283"],
+          "base_default_next" : "node_63",
           "next_tables" : {
-            "next349" : "node_61"
+            "next283" : "node_63"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 109,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17040,10 +17129,10 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 34,
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 353,
+            "line" : 287,
             "column" : 36,
             "source_fragment" : "pop_mpls_if_present()"
           },
@@ -17054,14 +17143,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [100],
+          "action_ids" : [101],
           "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" : 100,
+            "action_id" : 101,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17069,10 +17158,10 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 35,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 355,
+            "line" : 289,
             "column" : 12,
             "source_fragment" : "set_mpls()"
           },
@@ -17083,14 +17172,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [101],
+          "action_ids" : [102],
           "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" : 101,
+            "action_id" : 102,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17098,10 +17187,10 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 36,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 331,
+            "line" : 265,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
@@ -17125,27 +17214,27 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [102, 103, 104],
+          "action_ids" : [103, 104, 105],
           "actions" : ["FabricEgress.egress_next.push_vlan", "FabricEgress.egress_next.pop_vlan", "FabricEgress.egress_next.drop"],
-          "base_default_next" : "node_66",
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_66",
-            "FabricEgress.egress_next.pop_vlan" : "node_66",
-            "FabricEgress.egress_next.drop" : "node_66"
+            "FabricEgress.egress_next.push_vlan" : "node_68",
+            "FabricEgress.egress_next.pop_vlan" : "node_68",
+            "FabricEgress.egress_next.drop" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 105,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next375",
-          "id" : 37,
+          "name" : "tbl_next309",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 375,
+            "line" : 309,
             "column" : 25,
             "source_fragment" : "="
           },
@@ -17156,25 +17245,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [110],
-          "actions" : ["next375"],
-          "base_default_next" : "node_68",
+          "action_ids" : [111],
+          "actions" : ["next309"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "next375" : "node_68"
+            "next309" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 110,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next376",
-          "id" : 38,
+          "name" : "tbl_next310",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 310,
             "column" : 35,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -17185,25 +17274,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109],
-          "actions" : ["next376"],
-          "base_default_next" : "node_74",
+          "action_ids" : [110],
+          "actions" : ["next310"],
+          "base_default_next" : "node_76",
           "next_tables" : {
-            "next376" : "node_74"
+            "next310" : "node_76"
           },
           "default_entry" : {
-            "action_id" : 109,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next379",
-          "id" : 39,
+          "name" : "tbl_next313",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 379,
+            "line" : 313,
             "column" : 29,
             "source_fragment" : "="
           },
@@ -17214,25 +17303,25 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112],
-          "actions" : ["next379"],
-          "base_default_next" : "node_72",
+          "action_ids" : [113],
+          "actions" : ["next313"],
+          "base_default_next" : "node_74",
           "next_tables" : {
-            "next379" : "node_72"
+            "next313" : "node_74"
           },
           "default_entry" : {
-            "action_id" : 112,
+            "action_id" : 113,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_next380",
-          "id" : 40,
+          "name" : "tbl_next314",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 380,
+            "line" : 314,
             "column" : 39,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -17243,14 +17332,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111],
-          "actions" : ["next380"],
-          "base_default_next" : "node_74",
+          "action_ids" : [112],
+          "actions" : ["next314"],
+          "base_default_next" : "node_76",
           "next_tables" : {
-            "next380" : "node_74"
+            "next314" : "node_76"
           },
           "default_entry" : {
-            "action_id" : 111,
+            "action_id" : 112,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17258,7 +17347,7 @@
         },
         {
           "name" : "tbl_spgw_gtpu_encap",
-          "id" : 41,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 339,
@@ -17272,14 +17361,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
+          "action_ids" : [106],
           "actions" : ["FabricEgress.spgw.gtpu_encap"],
-          "base_default_next" : "node_77",
+          "base_default_next" : "node_79",
           "next_tables" : {
-            "FabricEgress.spgw.gtpu_encap" : "node_77"
+            "FabricEgress.spgw.gtpu_encap" : "node_79"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17287,7 +17376,7 @@
         },
         {
           "name" : "tbl_spgw342",
-          "id" : 42,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 342,
@@ -17301,14 +17390,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [113],
+          "action_ids" : [114],
           "actions" : ["spgw342"],
-          "base_default_next" : "node_79",
+          "base_default_next" : "node_81",
           "next_tables" : {
-            "spgw342" : "node_79"
+            "spgw342" : "node_81"
           },
           "default_entry" : {
-            "action_id" : 113,
+            "action_id" : 114,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17316,7 +17405,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 43,
+          "id" : 44,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -17355,15 +17444,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [66, 62],
+          "action_ids" : [67, 63],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_82",
+          "base_default_next" : "node_84",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_82",
-            "nop" : "node_82"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_84",
+            "nop" : "node_84"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17371,7 +17460,7 @@
         },
         {
           "name" : "tbl_act",
-          "id" : 44,
+          "id" : 45,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -17379,14 +17468,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [114],
+          "action_ids" : [115],
           "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" : 114,
+            "action_id" : 115,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17394,7 +17483,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 45,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -17415,15 +17504,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [67, 63],
+          "action_ids" : [68, 64],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_85",
+          "base_default_next" : "node_87",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_85",
-            "nop" : "node_85"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_87",
+            "nop" : "node_87"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17431,7 +17520,7 @@
         },
         {
           "name" : "tbl_int_transit420",
-          "id" : 46,
+          "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -17445,14 +17534,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [115],
+          "action_ids" : [116],
           "actions" : ["int_transit420"],
-          "base_default_next" : "node_87",
+          "base_default_next" : "node_89",
           "next_tables" : {
-            "int_transit420" : "node_87"
+            "int_transit420" : "node_89"
           },
           "default_entry" : {
-            "action_id" : 115,
+            "action_id" : 116,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -17460,7 +17549,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 47,
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -17481,7 +17570,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 64],
+          "action_ids" : [69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 65],
           "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" : {
@@ -17504,7 +17593,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 65,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -17524,7 +17613,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 1
@@ -17543,7 +17632,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 2
@@ -17562,7 +17651,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 3
@@ -17581,7 +17670,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 4
@@ -17600,7 +17689,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 5
@@ -17619,7 +17708,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 6
@@ -17638,7 +17727,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 7
@@ -17657,7 +17746,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 8
@@ -17676,7 +17765,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 9
@@ -17695,7 +17784,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 10
@@ -17714,7 +17803,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 11
@@ -17733,7 +17822,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 12
@@ -17752,7 +17841,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 13
@@ -17771,7 +17860,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 14
@@ -17790,7 +17879,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 15
@@ -17809,7 +17898,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 16
@@ -17818,7 +17907,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 48,
+          "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -17839,7 +17928,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 65],
+          "action_ids" : [85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 66],
           "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" : {
@@ -17862,7 +17951,7 @@
             "NoAction" : "tbl_int_transit425"
           },
           "default_entry" : {
-            "action_id" : 65,
+            "action_id" : 66,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -17882,7 +17971,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 1
@@ -17901,7 +17990,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 2
@@ -17920,7 +18009,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 3
@@ -17939,7 +18028,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 4
@@ -17958,7 +18047,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 5
@@ -17977,7 +18066,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 6
@@ -17996,7 +18085,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 7
@@ -18015,7 +18104,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 8
@@ -18034,7 +18123,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 93,
                 "action_data" : []
               },
               "priority" : 9
@@ -18053,7 +18142,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 93,
+                "action_id" : 94,
                 "action_data" : []
               },
               "priority" : 10
@@ -18072,7 +18161,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 94,
+                "action_id" : 95,
                 "action_data" : []
               },
               "priority" : 11
@@ -18091,7 +18180,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 95,
+                "action_id" : 96,
                 "action_data" : []
               },
               "priority" : 12
@@ -18110,7 +18199,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 97,
                 "action_data" : []
               },
               "priority" : 13
@@ -18129,7 +18218,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 98,
                 "action_data" : []
               },
               "priority" : 14
@@ -18148,7 +18237,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 99,
                 "action_data" : []
               },
               "priority" : 15
@@ -18167,7 +18256,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 100,
                 "action_data" : []
               },
               "priority" : 16
@@ -18176,7 +18265,7 @@
         },
         {
           "name" : "tbl_int_transit425",
-          "id" : 49,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -18190,14 +18279,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [117],
+          "action_ids" : [118],
           "actions" : ["int_transit425"],
-          "base_default_next" : "node_91",
+          "base_default_next" : "node_93",
           "next_tables" : {
-            "int_transit425" : "node_91"
+            "int_transit425" : "node_93"
           },
           "default_entry" : {
-            "action_id" : 117,
+            "action_id" : 118,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18205,7 +18294,7 @@
         },
         {
           "name" : "tbl_int_transit428",
-          "id" : 50,
+          "id" : 51,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -18219,14 +18308,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [116],
+          "action_ids" : [117],
           "actions" : ["int_transit428"],
-          "base_default_next" : "node_93",
+          "base_default_next" : "node_95",
           "next_tables" : {
-            "int_transit428" : "node_93"
+            "int_transit428" : "node_95"
           },
           "default_entry" : {
-            "action_id" : 116,
+            "action_id" : 117,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18234,7 +18323,7 @@
         },
         {
           "name" : "tbl_int_transit431",
-          "id" : 51,
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -18248,14 +18337,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [118],
+          "action_ids" : [119],
           "actions" : ["int_transit431"],
-          "base_default_next" : "node_95",
+          "base_default_next" : "node_97",
           "next_tables" : {
-            "int_transit431" : "node_95"
+            "int_transit431" : "node_97"
           },
           "default_entry" : {
-            "action_id" : 118,
+            "action_id" : 119,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18263,7 +18352,7 @@
         },
         {
           "name" : "tbl_int_transit434",
-          "id" : 52,
+          "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -18277,14 +18366,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [119],
+          "action_ids" : [120],
           "actions" : ["int_transit434"],
           "base_default_next" : null,
           "next_tables" : {
             "int_transit434" : null
           },
           "default_entry" : {
-            "action_id" : 119,
+            "action_id" : 120,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18294,11 +18383,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_55",
-          "id" : 20,
+          "name" : "node_57",
+          "id" : 21,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 103,
+            "line" : 108,
             "column" : 33,
             "source_fragment" : "fabric_metadata"
           },
@@ -18314,11 +18403,11 @@
             }
           },
           "true_next" : "tbl_packetio41",
-          "false_next" : "node_57"
+          "false_next" : "node_59"
         },
         {
-          "name" : "node_57",
-          "id" : 21,
+          "name" : "node_59",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -18340,14 +18429,14 @@
             }
           },
           "true_next" : "tbl_packetio44",
-          "false_next" : "node_59"
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_59",
-          "id" : 22,
+          "name" : "node_61",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 347,
+            "line" : 281,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -18382,15 +18471,15 @@
               }
             }
           },
-          "true_next" : "tbl_next349",
-          "false_next" : "node_61"
+          "true_next" : "tbl_next283",
+          "false_next" : "node_63"
         },
         {
-          "name" : "node_61",
-          "id" : 23,
+          "name" : "node_63",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 352,
+            "line" : 286,
             "column" : 12,
             "source_fragment" : "fabric_metadata.mpls_label == 0"
           },
@@ -18408,15 +18497,15 @@
               }
             }
           },
-          "true_next" : "node_62",
+          "true_next" : "node_64",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_62",
-          "id" : 24,
+          "name" : "node_64",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 353,
+            "line" : 287,
             "column" : 16,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -18435,11 +18524,11 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_66",
-          "id" : 25,
+          "name" : "node_68",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 374,
+            "line" : 308,
             "column" : 12,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -18454,15 +18543,15 @@
               }
             }
           },
-          "true_next" : "tbl_next375",
-          "false_next" : "node_70"
+          "true_next" : "tbl_next309",
+          "false_next" : "node_72"
         },
         {
-          "name" : "node_68",
-          "id" : 26,
+          "name" : "node_70",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 376,
+            "line" : 310,
             "column" : 16,
             "source_fragment" : "hdr.mpls.ttl == 0"
           },
@@ -18480,15 +18569,15 @@
               }
             }
           },
-          "true_next" : "tbl_next376",
-          "false_next" : "node_74"
+          "true_next" : "tbl_next310",
+          "false_next" : "node_76"
         },
         {
-          "name" : "node_70",
-          "id" : 27,
+          "name" : "node_72",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 378,
+            "line" : 312,
             "column" : 15,
             "source_fragment" : "hdr.ipv4.isValid() && fabric_metadata.fwd_type != FWD_BRIDGING"
           },
@@ -18523,15 +18612,15 @@
               }
             }
           },
-          "true_next" : "tbl_next379",
-          "false_next" : "node_74"
+          "true_next" : "tbl_next313",
+          "false_next" : "node_76"
         },
         {
-          "name" : "node_72",
-          "id" : 28,
+          "name" : "node_74",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 380,
+            "line" : 314,
             "column" : 20,
             "source_fragment" : "hdr.ipv4.ttl == 0"
           },
@@ -18549,12 +18638,12 @@
               }
             }
           },
-          "true_next" : "tbl_next380",
-          "false_next" : "node_74"
+          "true_next" : "tbl_next314",
+          "false_next" : "node_76"
         },
         {
-          "name" : "node_74",
-          "id" : 29,
+          "name" : "node_76",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 337,
@@ -18579,15 +18668,15 @@
               }
             }
           },
-          "true_next" : "node_75",
-          "false_next" : "node_79"
+          "true_next" : "node_77",
+          "false_next" : "node_81"
         },
         {
-          "name" : "node_75",
-          "id" : 30,
+          "name" : "node_77",
+          "id" : 31,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 106,
+            "line" : 111,
             "column" : 24,
             "source_fragment" : "fabric_metadata"
           },
@@ -18603,11 +18692,11 @@
             }
           },
           "true_next" : "tbl_spgw_gtpu_encap",
-          "false_next" : "node_77"
+          "false_next" : "node_79"
         },
         {
-          "name" : "node_77",
-          "id" : 31,
+          "name" : "node_79",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/spgw.p4",
             "line" : 341,
@@ -18633,11 +18722,11 @@
             }
           },
           "true_next" : "tbl_spgw342",
-          "false_next" : "node_79"
+          "false_next" : "node_81"
         },
         {
-          "name" : "node_79",
-          "id" : 32,
+          "name" : "node_81",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -18713,14 +18802,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_80"
+          "true_next" : "node_82"
         },
         {
-          "name" : "node_80",
-          "id" : 33,
+          "name" : "node_82",
+          "id" : 34,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 112,
+            "line" : 117,
             "column" : 36,
             "source_fragment" : "fabric_metadata"
           },
@@ -18736,11 +18825,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_82"
+          "false_next" : "node_84"
         },
         {
-          "name" : "node_82",
-          "id" : 34,
+          "name" : "node_84",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -18762,8 +18851,8 @@
           "true_next" : "tbl_act"
         },
         {
-          "name" : "node_85",
-          "id" : 35,
+          "name" : "node_87",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -18789,11 +18878,11 @@
             }
           },
           "true_next" : "tbl_int_transit420",
-          "false_next" : "node_87"
+          "false_next" : "node_89"
         },
         {
-          "name" : "node_87",
-          "id" : 36,
+          "name" : "node_89",
+          "id" : 37,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -18816,8 +18905,8 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_91",
-          "id" : 37,
+          "name" : "node_93",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -18836,11 +18925,11 @@
             }
           },
           "true_next" : "tbl_int_transit428",
-          "false_next" : "node_93"
+          "false_next" : "node_95"
         },
         {
-          "name" : "node_93",
-          "id" : 38,
+          "name" : "node_95",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -18859,11 +18948,11 @@
             }
           },
           "true_next" : "tbl_int_transit431",
-          "false_next" : "node_95"
+          "false_next" : "node_97"
         },
         {
-          "name" : "node_95",
-          "id" : 39,
+          "name" : "node_97",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,