diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java
index 3558bd5..180a521 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/PiInstruction.java
@@ -75,9 +75,9 @@
     public String toString() {
         switch (tableAction.type()) {
             case ACTION_GROUP_ID:
-                return "GROUP:" + ((PiActionGroupId) tableAction).id().toString();
+                return "GROUP:0x" + Integer.toHexString(((PiActionGroupId) tableAction).id());
             case GROUP_MEMBER_ID:
-                return "GROUP_MEMBER:" + ((PiActionGroupMemberId) tableAction).id().toString();
+                return "GROUP_MEMBER:0x" + Integer.toHexString(((PiActionGroupMemberId) tableAction).id());
             default:
                 return tableAction.toString();
         }
diff --git a/core/api/src/main/java/org/onosproject/net/pi/model/PiPipelineInterpreter.java b/core/api/src/main/java/org/onosproject/net/pi/model/PiPipelineInterpreter.java
index 9206f5c..cada0f9 100644
--- a/core/api/src/main/java/org/onosproject/net/pi/model/PiPipelineInterpreter.java
+++ b/core/api/src/main/java/org/onosproject/net/pi/model/PiPipelineInterpreter.java
@@ -64,6 +64,10 @@
      * @param flowRuleTableId a numeric table ID
      * @return PI table ID
      */
+    // FIXME: remove this method. The only place where this mapping seems useful
+    // is when using the default single table pipeliner which produces flow
+    // rules for table 0. Instead, PI pipeliners should provide a mapping to a
+    // specific PiTableId even when mapping to a single table.
     Optional<PiTableId> mapFlowRuleTableId(int flowRuleTableId);
 
     /**
@@ -75,6 +79,7 @@
      * @param piTableId PI table ID
      * @return numeric table ID
      */
+    // FIXME: as above
     Optional<Integer> mapPiTableId(PiTableId piTableId);
 
     /**
diff --git a/core/api/src/main/java/org/onosproject/net/pi/runtime/PiMulticastGroupEntry.java b/core/api/src/main/java/org/onosproject/net/pi/runtime/PiMulticastGroupEntry.java
index 6a848ac..7bb4c2d 100644
--- a/core/api/src/main/java/org/onosproject/net/pi/runtime/PiMulticastGroupEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/pi/runtime/PiMulticastGroupEntry.java
@@ -92,7 +92,7 @@
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-                .add("groupId", groupId)
+                .add("groupId", "0x" + Integer.toHexString(groupId))
                 .add("replicas", replicas)
                 .toString();
     }
diff --git a/core/api/src/main/java/org/onosproject/net/pi/runtime/PiPreReplica.java b/core/api/src/main/java/org/onosproject/net/pi/runtime/PiPreReplica.java
index b661d27..4f65e4d 100644
--- a/core/api/src/main/java/org/onosproject/net/pi/runtime/PiPreReplica.java
+++ b/core/api/src/main/java/org/onosproject/net/pi/runtime/PiPreReplica.java
@@ -84,6 +84,6 @@
 
     @Override
     public String toString() {
-        return format("%s:%d", egressPort, instanceId);
+        return format("%s:0x%s", egressPort, Integer.toHexString(instanceId));
     }
 }
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java
index 213947c..45be79e 100644
--- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java
+++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java
@@ -272,7 +272,7 @@
             return null;
         }
         if (!translatedEntity.get().translated().equals(piGroup)) {
-            log.warn("Group obtained from device {} is different from the one in" +
+            log.warn("Group obtained from device {} is different from the one in " +
                              "translation store: device={}, store={}",
                      deviceId, piGroup, translatedEntity.get().translated());
             return null;
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/AbstractFabricHandlerBehavior.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/AbstractFabricHandlerBehavior.java
new file mode 100644
index 0000000..2753844
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/AbstractFabricHandlerBehavior.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric;
+
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.driver.AbstractHandlerBehaviour;
+import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.net.pi.model.PiPipeconfId;
+import org.onosproject.net.pi.service.PiPipeconfService;
+import org.slf4j.Logger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Abstract implementation of HandlerBehaviour for the fabric pipeconf
+ * behaviors.
+ */
+public class AbstractFabricHandlerBehavior extends AbstractHandlerBehaviour {
+
+    protected final Logger log = getLogger(getClass());
+
+    protected FabricCapabilities capabilities;
+
+    @Override
+    public void setHandler(DriverHandler handler) {
+        super.setHandler(handler);
+        final PiPipeconfService pipeconfService = handler().get(PiPipeconfService.class);
+        setCapabilities(handler().data().deviceId(), pipeconfService);
+    }
+
+    private void setCapabilities(DeviceId deviceId, PiPipeconfService pipeconfService) {
+        checkNotNull(deviceId);
+        checkNotNull(pipeconfService);
+        // Get pipeconf capabilities.
+        final PiPipeconfId pipeconfId = pipeconfService.ofDevice(deviceId)
+                .orElse(null);
+        if (pipeconfId == null) {
+            throw new IllegalStateException(format(
+                    "Unable to get pipeconf ID of device %s", deviceId.toString()));
+        }
+        if (!pipeconfService.getPipeconf(pipeconfId).isPresent()) {
+            throw new IllegalStateException(format(
+                    "Pipeconf '%s' is not registered ", pipeconfId));
+        }
+        this.capabilities = new FabricCapabilities(
+                pipeconfService.getPipeconf(pipeconfId).get());
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricCapabilities.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricCapabilities.java
new file mode 100644
index 0000000..07986f9
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricCapabilities.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric;
+
+import org.onosproject.net.pi.model.PiPipeconf;
+import org.slf4j.Logger;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.net.pi.model.PiPipeconf.ExtensionType.CPU_PORT_TXT;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Representation of the capabilities of a given fabric pipeconf.
+ */
+public class FabricCapabilities {
+
+    private final Logger log = getLogger(getClass());
+
+    private final PiPipeconf pipeconf;
+
+    FabricCapabilities(PiPipeconf pipeconf) {
+        this.pipeconf = checkNotNull(pipeconf);
+    }
+
+    public boolean hasHashedTable() {
+        return pipeconf.pipelineModel()
+                .table(FabricConstants.FABRIC_INGRESS_NEXT_HASHED).isPresent();
+    }
+
+    public Optional<Integer> cpuPort() {
+        // This is probably brittle, but needed to dynamically get the CPU port
+        // for different platforms.
+        if (!pipeconf.extension(CPU_PORT_TXT).isPresent()) {
+            log.warn("Missing {} extension in pipeconf {}", CPU_PORT_TXT, pipeconf.id());
+            return Optional.empty();
+        }
+        try {
+            final InputStream stream = pipeconf.extension(CPU_PORT_TXT).get();
+            final BufferedReader buff = new BufferedReader(
+                    new InputStreamReader(stream));
+            final String str = buff.readLine();
+            buff.close();
+            if (str == null) {
+                log.error("Empty CPU port file for {}", pipeconf.id());
+                return Optional.empty();
+            }
+            try {
+                return Optional.of(Integer.parseInt(str));
+            } catch (NumberFormatException e) {
+                log.error("Invalid CPU port for {}: {}", pipeconf.id(), str);
+                return Optional.empty();
+            }
+        } catch (IOException e) {
+            log.error("Unable to read CPU port file of {}: {}",
+                      pipeconf.id(), e.getMessage());
+            return Optional.empty();
+        }
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index 07bb862..9ecc65f 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -33,55 +33,49 @@
     }
 
     // Header field IDs
-    public static final PiMatchFieldId HDR_VLAN_TAG_VLAN_ID =
-            PiMatchFieldId.of("hdr.vlan_tag.vlan_id");
+    public static final PiMatchFieldId HDR_ICMP_CODE =
+            PiMatchFieldId.of("icmp_code");
+    public static final PiMatchFieldId HDR_IG_PORT =
+            PiMatchFieldId.of("ig_port");
+    public static final PiMatchFieldId HDR_ETH_DST =
+            PiMatchFieldId.of("eth_dst");
+    public static final PiMatchFieldId HDR_GTP_IPV4_DST =
+            PiMatchFieldId.of("gtp_ipv4_dst");
+    public static final PiMatchFieldId HDR_VLAN_IS_VALID =
+            PiMatchFieldId.of("vlan_is_valid");
+    public static final PiMatchFieldId HDR_IPV4_DST =
+            PiMatchFieldId.of("ipv4_dst");
+    public static final PiMatchFieldId HDR_INT_IS_VALID =
+            PiMatchFieldId.of("int_is_valid");
+    public static final PiMatchFieldId HDR_EG_PORT =
+            PiMatchFieldId.of("eg_port");
+    public static final PiMatchFieldId HDR_EG_SPEC =
+            PiMatchFieldId.of("eg_spec");
+    public static final PiMatchFieldId HDR_IPV4_SRC =
+            PiMatchFieldId.of("ipv4_src");
+    public static final PiMatchFieldId HDR_IPV6_DST =
+            PiMatchFieldId.of("ipv6_dst");
+    public static final PiMatchFieldId HDR_ETH_TYPE =
+            PiMatchFieldId.of("eth_type");
     public static final PiMatchFieldId HDR_MPLS_LABEL =
-            PiMatchFieldId.of("hdr.mpls.label");
-    public static final PiMatchFieldId STANDARD_METADATA_EGRESS_PORT =
-            PiMatchFieldId.of("standard_metadata.egress_port");
-    public static final PiMatchFieldId STANDARD_METADATA_INGRESS_PORT =
-            PiMatchFieldId.of("standard_metadata.ingress_port");
-    public static final PiMatchFieldId HDR_VLAN_TAG_IS_VALID =
-            PiMatchFieldId.of("hdr.vlan_tag.is_valid");
-    public static final PiMatchFieldId HDR_ICMP_ICMP_CODE =
-            PiMatchFieldId.of("hdr.icmp.icmp_code");
-    public static final PiMatchFieldId HDR_INT_HEADER_IS_VALID =
-            PiMatchFieldId.of("hdr.int_header.is_valid");
-    public static final PiMatchFieldId HDR_ETHERNET_SRC_ADDR =
-            PiMatchFieldId.of("hdr.ethernet.src_addr");
-    public static final PiMatchFieldId HDR_ICMP_ICMP_TYPE =
-            PiMatchFieldId.of("hdr.icmp.icmp_type");
-    public static final PiMatchFieldId HDR_VLAN_TAG_ETHER_TYPE =
-            PiMatchFieldId.of("hdr.vlan_tag.ether_type");
-    public static final PiMatchFieldId HDR_IPV4_DST_ADDR =
-            PiMatchFieldId.of("hdr.ipv4.dst_addr");
-    public static final PiMatchFieldId HDR_INT_HEADER_INSTRUCTION_MASK_0003 =
-            PiMatchFieldId.of("hdr.int_header.instruction_mask_0003");
-    public static final PiMatchFieldId FABRIC_METADATA_L4_SRC_PORT =
-            PiMatchFieldId.of("fabric_metadata.l4_src_port");
-    public static final PiMatchFieldId FABRIC_METADATA_L4_DST_PORT =
-            PiMatchFieldId.of("fabric_metadata.l4_dst_port");
-    public static final PiMatchFieldId STANDARD_METADATA_EGRESS_SPEC =
-            PiMatchFieldId.of("standard_metadata.egress_spec");
-    public static final PiMatchFieldId GTPU_IPV4_DST_ADDR =
-            PiMatchFieldId.of("gtpu_ipv4.dst_addr");
-    public static final PiMatchFieldId FABRIC_METADATA_IP_PROTO =
-            PiMatchFieldId.of("fabric_metadata.ip_proto");
-    public static final PiMatchFieldId FABRIC_METADATA_NEXT_ID =
-            PiMatchFieldId.of("fabric_metadata.next_id");
-    public static final PiMatchFieldId HDR_IPV4_SRC_ADDR =
-            PiMatchFieldId.of("hdr.ipv4.src_addr");
-    public static final PiMatchFieldId HDR_INT_HEADER_INSTRUCTION_MASK_0407 =
-            PiMatchFieldId.of("hdr.int_header.instruction_mask_0407");
-    public static final PiMatchFieldId HDR_IPV6_DST_ADDR =
-            PiMatchFieldId.of("hdr.ipv6.dst_addr");
-    public static final PiMatchFieldId IPV4_DST_ADDR =
-            PiMatchFieldId.of("ipv4.dst_addr");
-    public static final PiMatchFieldId HDR_ETHERNET_DST_ADDR =
-            PiMatchFieldId.of("hdr.ethernet.dst_addr");
+            PiMatchFieldId.of("mpls_label");
+    public static final PiMatchFieldId HDR_ETH_SRC =
+            PiMatchFieldId.of("eth_src");
+    public static final PiMatchFieldId HDR_IP_PROTO =
+            PiMatchFieldId.of("ip_proto");
+    public static final PiMatchFieldId HDR_L4_DPORT =
+            PiMatchFieldId.of("l4_dport");
+    public static final PiMatchFieldId HDR_NEXT_ID =
+            PiMatchFieldId.of("next_id");
+    public static final PiMatchFieldId HDR_ICMP_TYPE =
+            PiMatchFieldId.of("icmp_type");
+    public static final PiMatchFieldId HDR_VLAN_ID =
+            PiMatchFieldId.of("vlan_id");
+    public static final PiMatchFieldId HDR_L4_SPORT =
+            PiMatchFieldId.of("l4_sport");
     // Table IDs
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_ACL =
-            PiTableId.of("FabricIngress.forwarding.acl");
+    public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
+            PiTableId.of("FabricIngress.next.multicast");
     public static final PiTableId FABRIC_INGRESS_NEXT_HASHED =
             PiTableId.of("FabricIngress.next.hashed");
     public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_TB_INT_SOURCE =
@@ -92,12 +86,12 @@
             PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink");
     public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V4 =
             PiTableId.of("FabricIngress.forwarding.routing_v4");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INST_0407 =
-            PiTableId.of("FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407");
     public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INSERT =
             PiTableId.of("FabricEgress.process_int_main.process_int_transit.tb_int_insert");
-    public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
-            PiTableId.of("FabricIngress.next.simple");
+    public static final PiTableId FABRIC_INGRESS_ACL_ACL =
+            PiTableId.of("FabricIngress.acl.acl");
+    public static final PiTableId FABRIC_INGRESS_NEXT_XCONNECT =
+            PiTableId.of("FabricIngress.next.xconnect");
     public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
             PiTableId.of("FabricIngress.filtering.fwd_classifier");
     public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE =
@@ -106,20 +100,18 @@
             PiTableId.of("FabricIngress.forwarding.bridging");
     public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_S1U_FILTER_TABLE =
             PiTableId.of("FabricIngress.spgw_ingress.s1u_filter_table");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INST_0003 =
-            PiTableId.of("FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003");
-    public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
-            PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
     public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_TB_GENERATE_REPORT =
             PiTableId.of("FabricEgress.process_int_main.process_int_report.tb_generate_report");
+    public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
+            PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
     public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DL_SESS_LOOKUP =
             PiTableId.of("FabricIngress.spgw_ingress.dl_sess_lookup");
     public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
             PiTableId.of("FabricEgress.egress_next.egress_vlan");
-    public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
-            PiTableId.of("FabricIngress.next.multicast");
-    public static final PiTableId FABRIC_INGRESS_NEXT_VLAN_META =
-            PiTableId.of("FabricIngress.next.vlan_meta");
+    public static final PiTableId FABRIC_INGRESS_NEXT_NEXT_VLAN =
+            PiTableId.of("FabricIngress.next.next_vlan");
+    public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
+            PiTableId.of("FabricIngress.next.simple");
     public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V6 =
             PiTableId.of("FabricIngress.forwarding.routing_v6");
     // Indirect Counter IDs
@@ -128,12 +120,10 @@
     public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_INGRESS_PORT_COUNTER =
             PiCounterId.of("FabricIngress.port_counters_control.ingress_port_counter");
     // Direct Counter IDs
-    public static final PiCounterId FABRIC_INGRESS_FORWARDING_ACL_COUNTER =
-            PiCounterId.of("FabricIngress.forwarding.acl_counter");
     public static final PiCounterId FABRIC_INGRESS_NEXT_MULTICAST_COUNTER =
             PiCounterId.of("FabricIngress.next.multicast_counter");
-    public static final PiCounterId FABRIC_INGRESS_NEXT_VLAN_META_COUNTER =
-            PiCounterId.of("FabricIngress.next.vlan_meta_counter");
+    public static final PiCounterId FABRIC_INGRESS_NEXT_SIMPLE_COUNTER =
+            PiCounterId.of("FabricIngress.next.simple_counter");
     public static final PiCounterId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER_COUNTER =
             PiCounterId.of("FabricIngress.filtering.fwd_classifier_counter");
     public static final PiCounterId FABRIC_INGRESS_FORWARDING_BRIDGING_COUNTER =
@@ -146,12 +136,16 @@
             PiCounterId.of("FabricEgress.process_int_main.process_int_source.counter_int_source");
     public static final PiCounterId FABRIC_INGRESS_SPGW_INGRESS_UE_COUNTER =
             PiCounterId.of("FabricIngress.spgw_ingress.ue_counter");
-    public static final PiCounterId FABRIC_INGRESS_NEXT_SIMPLE_COUNTER =
-            PiCounterId.of("FabricIngress.next.simple_counter");
     public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SINK =
             PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_sink");
     public static final PiCounterId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN_COUNTER =
             PiCounterId.of("FabricEgress.egress_next.egress_vlan_counter");
+    public static final PiCounterId FABRIC_INGRESS_ACL_ACL_COUNTER =
+            PiCounterId.of("FabricIngress.acl.acl_counter");
+    public static final PiCounterId FABRIC_INGRESS_NEXT_XCONNECT_COUNTER =
+            PiCounterId.of("FabricIngress.next.xconnect_counter");
+    public static final PiCounterId FABRIC_INGRESS_NEXT_NEXT_VLAN_COUNTER =
+            PiCounterId.of("FabricIngress.next.next_vlan_counter");
     public static final PiCounterId FABRIC_INGRESS_FORWARDING_ROUTING_V6_COUNTER =
             PiCounterId.of("FabricIngress.forwarding.routing_v6_counter");
     public static final PiCounterId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN_COUNTER =
@@ -161,151 +155,73 @@
     public static final PiCounterId FABRIC_INGRESS_NEXT_HASHED_COUNTER =
             PiCounterId.of("FabricIngress.next.hashed_counter");
     // Action IDs
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_PUNT_TO_CPU =
-            PiActionId.of("FabricIngress.forwarding.punt_to_cpu");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I5 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5");
-    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_SIMPLE =
-            PiActionId.of("FabricIngress.next.mpls_routing_v6_simple");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I12 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12");
+    public static final PiActionId FABRIC_INGRESS_NEXT_SET_NEXT_ID_XCONNECT =
+            PiActionId.of("FabricIngress.next.set_next_id_xconnect");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_NOP_ROUTING_V4 =
             PiActionId.of("FabricIngress.forwarding.nop_routing_v4");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I10 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I11 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11");
-    public static final PiActionId FABRIC_INGRESS_FILTERING_NOP_INGRESS_PORT_VLAN =
-            PiActionId.of("FabricIngress.filtering.nop_ingress_port_vlan");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I14 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14");
+    public static final PiActionId FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN =
+            PiActionId.of("FabricIngress.filtering.permit_with_internal_vlan");
+    public static final PiActionId FABRIC_INGRESS_NEXT_ROUTING_HASHED =
+            PiActionId.of("FabricIngress.next.routing_hashed");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING =
             PiActionId.of("FabricIngress.forwarding.set_next_id_bridging");
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_INT_SOURCE_DSCP =
             PiActionId.of("FabricEgress.process_int_main.process_int_source.int_source_dscp");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I0 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0");
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INIT_METADATA =
             PiActionId.of("FabricEgress.process_int_main.process_int_transit.init_metadata");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I14 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14");
-    public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
-            PiActionId.of("FabricEgress.egress_next.pop_vlan");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I4 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I2 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2");
+    public static final PiActionId FABRIC_INGRESS_ACL_DROP =
+            PiActionId.of("FabricIngress.acl.drop");
     public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN =
             PiActionId.of("FabricIngress.next.set_vlan");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I4 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4");
-    public static final PiActionId FABRIC_EGRESS_SPGW_EGRESS_GTPU_ENCAP =
-            PiActionId.of("FabricEgress.spgw_egress.gtpu_encap");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I12 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I13 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13");
-    public static final PiActionId FABRIC_INGRESS_FILTERING_SET_VLAN =
-            PiActionId.of("FabricIngress.filtering.set_vlan");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I11 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11");
-    public static final PiActionId FABRIC_EGRESS_PKT_IO_EGRESS_POP_VLAN =
-            PiActionId.of("FabricEgress.pkt_io_egress.pop_vlan");
-    public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_SIMPLE =
-            PiActionId.of("FabricIngress.next.l3_routing_simple");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I15 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15");
-    public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP =
-            PiActionId.of("FabricIngress.next.set_mcast_group");
+    public static final PiActionId FABRIC_INGRESS_ACL_NOP_ACL =
+            PiActionId.of("FabricIngress.acl.nop_acl");
+    public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_XCONNECT =
+            PiActionId.of("FabricIngress.next.output_xconnect");
+    public static final PiActionId FABRIC_INGRESS_ACL_SET_NEXT_ID_ACL =
+            PiActionId.of("FabricIngress.acl.set_next_id_acl");
+    public static final PiActionId FABRIC_INGRESS_FILTERING_PERMIT =
+            PiActionId.of("FabricIngress.filtering.permit");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4 =
             PiActionId.of("FabricIngress.forwarding.set_next_id_routing_v4");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V6 =
             PiActionId.of("FabricIngress.forwarding.set_next_id_routing_v6");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I13 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13");
+    public static final PiActionId FABRIC_INGRESS_NEXT_ROUTING_SIMPLE =
+            PiActionId.of("FabricIngress.next.routing_simple");
     public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_DL_SESS_INFO =
             PiActionId.of("FabricIngress.spgw_ingress.set_dl_sess_info");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I7 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7");
-    public static final PiActionId FABRIC_INGRESS_FILTERING_PUSH_INTERNAL_VLAN =
-            PiActionId.of("FabricIngress.filtering.push_internal_vlan");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_CLONE_TO_CPU =
-            PiActionId.of("FabricIngress.forwarding.clone_to_cpu");
-    public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_GTPU_DECAP =
-            PiActionId.of("FabricIngress.spgw_ingress.gtpu_decap");
+    public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_HASHED =
+            PiActionId.of("FabricIngress.next.output_hashed");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT =
             PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
-    public static final PiActionId DROP_NOW = PiActionId.of("drop_now");
-    public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_HASHED =
-            PiActionId.of("FabricIngress.next.l3_routing_hashed");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I10 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I8 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I0 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0");
+    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_SIMPLE =
+            PiActionId.of("FabricIngress.next.mpls_routing_simple");
+    public static final PiActionId FABRIC_INGRESS_ACL_PUNT_TO_CPU =
+            PiActionId.of("FabricIngress.acl.punt_to_cpu");
+    public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
+            PiActionId.of("FabricEgress.egress_next.pop_vlan");
     public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SINK =
             PiActionId.of("FabricIngress.process_set_source_sink.int_set_sink");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SINK_INT_SINK =
-            PiActionId.of("FabricEgress.process_int_main.process_int_sink.int_sink");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I1 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1");
-    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED =
-            PiActionId.of("FabricIngress.next.mpls_routing_v4_hashed");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I1 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1");
+    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_HASHED =
+            PiActionId.of("FabricIngress.next.mpls_routing_hashed");
     public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SOURCE =
             PiActionId.of("FabricIngress.process_set_source_sink.int_set_source");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I3 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3");
     public static final PiActionId NOP = PiActionId.of("nop");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_DROP =
-            PiActionId.of("FabricIngress.forwarding.drop");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I6 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6");
     public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE =
             PiActionId.of("FabricIngress.next.output_simple");
-    public static final PiActionId FABRIC_INGRESS_FILTERING_DROP =
-            PiActionId.of("FabricIngress.filtering.drop");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SINK_RESTORE_HEADER =
-            PiActionId.of("FabricEgress.process_int_main.process_int_sink.restore_header");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I9 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9");
+    public static final PiActionId FABRIC_INGRESS_ACL_CLONE_TO_CPU =
+            PiActionId.of("FabricIngress.acl.clone_to_cpu");
+    public static final PiActionId FABRIC_INGRESS_FILTERING_DENY =
+            PiActionId.of("FabricIngress.filtering.deny");
     public static final PiActionId FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE =
             PiActionId.of("FabricIngress.filtering.set_forwarding_type");
-    public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT =
-            PiActionId.of("FabricIngress.next.set_vlan_output");
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_DO_REPORT_ENCAPSULATION =
             PiActionId.of("FabricEgress.process_int_main.process_int_report.do_report_encapsulation");
     public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I8 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I9 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I15 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15");
-    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_SIMPLE =
-            PiActionId.of("FabricIngress.next.mpls_routing_v4_simple");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_NOP_ACL =
-            PiActionId.of("FabricIngress.forwarding.nop_acl");
-    public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_HASHED =
-            PiActionId.of("FabricIngress.next.mpls_routing_v6_hashed");
-    public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN =
-            PiActionId.of("FabricIngress.next.l3_routing_vlan");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I2 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I3 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ACL =
-            PiActionId.of("FabricIngress.forwarding.set_next_id_acl");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I5 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I6 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6");
-    public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I7 =
-            PiActionId.of("FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7");
+    public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP_ID =
+            PiActionId.of("FabricIngress.next.set_mcast_group_id");
     // Action Param IDs
     public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
+    public static final PiActionParamId INS_CNT = PiActionParamId.of("ins_cnt");
     public static final PiActionParamId MON_IP = PiActionParamId.of("mon_ip");
     public static final PiActionParamId TEID = PiActionParamId.of("teid");
     public static final PiActionParamId INS_MASK0407 =
@@ -322,22 +238,21 @@
     public static final PiActionParamId SMAC = PiActionParamId.of("smac");
     public static final PiActionParamId MON_PORT =
             PiActionParamId.of("mon_port");
-    public static final PiActionParamId GID = PiActionParamId.of("gid");
-    public static final PiActionParamId NEW_VLAN_ID =
-            PiActionParamId.of("new_vlan_id");
     public static final PiActionParamId FWD_TYPE =
             PiActionParamId.of("fwd_type");
     public static final PiActionParamId MON_MAC = PiActionParamId.of("mon_mac");
     public static final PiActionParamId SRC_MAC = PiActionParamId.of("src_mac");
     public static final PiActionParamId NEXT_ID = PiActionParamId.of("next_id");
-    public static final PiActionParamId INS_CNT = PiActionParamId.of("ins_cnt");
+    public static final PiActionParamId GROUP_ID =
+            PiActionParamId.of("group_id");
     public static final PiActionParamId SWITCH_ID =
             PiActionParamId.of("switch_id");
     public static final PiActionParamId MAX_HOP = PiActionParamId.of("max_hop");
+    public static final PiActionParamId VLAN_ID = PiActionParamId.of("vlan_id");
     public static final PiActionParamId SRC_IP = PiActionParamId.of("src_ip");
     // Action Profile IDs
-    public static final PiActionProfileId FABRIC_INGRESS_NEXT_ECMP_SELECTOR =
-            PiActionProfileId.of("FabricIngress.next.ecmp_selector");
+    public static final PiActionProfileId FABRIC_INGRESS_NEXT_HASHED_SELECTOR =
+            PiActionProfileId.of("FabricIngress.next.hashed_selector");
     // Packet Metadata IDs
     public static final PiControlMetadataId INGRESS_PORT =
             PiControlMetadataId.of("ingress_port");
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricIntProgrammable.java
similarity index 95%
rename from pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java
rename to pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricIntProgrammable.java
index dec6332..a2bf569 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/IntProgrammableImpl.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricIntProgrammable.java
@@ -28,7 +28,6 @@
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.config.NetworkConfigService;
-import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.net.flow.DefaultFlowRule;
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -46,22 +45,19 @@
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
 import org.onosproject.provider.general.device.api.GeneralProviderDeviceConfig;
-import org.slf4j.Logger;
 
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import static org.onlab.util.ImmutableByteSequence.copyFrom;
-import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Implementation of INT programmable behavior for fabric.p4. Currently supports
  * only SOURCE and TRANSIT functionalities.
  */
-public class IntProgrammableImpl extends AbstractHandlerBehaviour implements IntProgrammable {
-
-    private final Logger log = getLogger(getClass());
+public class FabricIntProgrammable extends AbstractFabricHandlerBehavior
+        implements IntProgrammable {
 
     // TODO: change this value to the value of diameter of a network.
     private static final int DEFAULT_PRIORITY = 10000;
@@ -145,7 +141,7 @@
                 .build();
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchPi(PiCriterion.builder().matchExact(
-                        FabricConstants.HDR_INT_HEADER_IS_VALID, (byte) 0x01)
+                        FabricConstants.HDR_INT_IS_VALID, (byte) 0x01)
                                  .build())
                 .build();
 
@@ -171,7 +167,7 @@
         }
 
         PiCriterion ingressCriterion = PiCriterion.builder()
-                .matchExact(FabricConstants.STANDARD_METADATA_INGRESS_PORT, port.toLong())
+                .matchExact(FabricConstants.HDR_IG_PORT, port.toLong())
                 .build();
         TrafficSelector srcSelector = DefaultTrafficSelector.builder()
                 .matchPi(ingressCriterion)
@@ -203,7 +199,7 @@
         }
 
         PiCriterion egressCriterion = PiCriterion.builder()
-                .matchExact(FabricConstants.STANDARD_METADATA_EGRESS_PORT, port.toLong())
+                .matchExact(FabricConstants.HDR_EG_PORT, port.toLong())
                 .build();
         TrafficSelector sinkSelector = DefaultTrafficSelector.builder()
                 .matchPi(egressCriterion)
@@ -316,28 +312,28 @@
                 case TCP_SRC:
                     sBuilder.matchPi(
                             PiCriterion.builder().matchTernary(
-                                    FabricConstants.FABRIC_METADATA_L4_SRC_PORT,
+                                    FabricConstants.HDR_L4_SPORT,
                                     ((TcpPortCriterion) criterion).tcpPort().toInt(), PORTMASK)
                                     .build());
                     break;
                 case UDP_SRC:
                     sBuilder.matchPi(
                             PiCriterion.builder().matchTernary(
-                                    FabricConstants.FABRIC_METADATA_L4_SRC_PORT,
+                                    FabricConstants.HDR_L4_SPORT,
                                     ((UdpPortCriterion) criterion).udpPort().toInt(), PORTMASK)
                                     .build());
                     break;
                 case TCP_DST:
                     sBuilder.matchPi(
                             PiCriterion.builder().matchTernary(
-                                    FabricConstants.FABRIC_METADATA_L4_DST_PORT,
+                                    FabricConstants.HDR_L4_DPORT,
                                     ((TcpPortCriterion) criterion).tcpPort().toInt(), PORTMASK)
                                     .build());
                     break;
                 case UDP_DST:
                     sBuilder.matchPi(
                             PiCriterion.builder().matchTernary(
-                                    FabricConstants.FABRIC_METADATA_L4_DST_PORT,
+                                    FabricConstants.HDR_L4_DPORT,
                                     ((UdpPortCriterion) criterion).udpPort().toInt(), PORTMASK)
                                     .build());
                     break;
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
index 2d5b280..a90353e 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
@@ -16,7 +16,6 @@
 
 package org.onosproject.pipelines.fabric;
 
-import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -28,7 +27,6 @@
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.driver.AbstractHandlerBehaviour;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.criteria.Criterion;
 import org.onosproject.net.flow.instructions.Instructions;
@@ -36,20 +34,12 @@
 import org.onosproject.net.packet.InboundPacket;
 import org.onosproject.net.packet.OutboundPacket;
 import org.onosproject.net.pi.model.PiMatchFieldId;
-import org.onosproject.net.pi.model.PiPipeconf;
-import org.onosproject.net.pi.model.PiPipeconfId;
 import org.onosproject.net.pi.model.PiPipelineInterpreter;
 import org.onosproject.net.pi.model.PiTableId;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiControlMetadata;
 import org.onosproject.net.pi.runtime.PiPacketOperation;
-import org.onosproject.net.pi.service.PiPipeconfService;
-import org.slf4j.Logger;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.List;
@@ -63,96 +53,76 @@
 import static org.onosproject.net.PortNumber.FLOOD;
 import static org.onosproject.net.flow.instructions.Instruction.Type.OUTPUT;
 import static org.onosproject.net.pi.model.PiPacketOperationType.PACKET_OUT;
-import static org.onosproject.net.pi.model.PiPipeconf.ExtensionType.CPU_PORT_TXT;
-import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Interpreter for fabric pipeline.
  */
-public class FabricInterpreter extends AbstractHandlerBehaviour
+public class FabricInterpreter extends AbstractFabricHandlerBehavior
         implements PiPipelineInterpreter {
 
-    private final Logger log = getLogger(getClass());
+    private static final int PORT_BITWIDTH = 9;
 
-    public static final int PORT_BITWIDTH = 9;
-
-    private static final ImmutableBiMap<Integer, PiTableId> TABLE_ID_MAP =
-            ImmutableBiMap.<Integer, PiTableId>builder()
-                    // Filtering
-                    .put(0, FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN)
-                    .put(1, FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER)
-                    // Forwarding
-                    .put(2, FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS)
-                    .put(3, FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4)
-                    .put(4, FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6)
-                    .put(5, FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING)
-                    .put(6, FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)
-                    // Next
-                    .put(7, FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META)
-                    .put(8, FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)
-                    .put(9, FabricConstants.FABRIC_INGRESS_NEXT_HASHED)
-                    .put(10, FabricConstants.FABRIC_INGRESS_NEXT_MULTICAST)
-                    .put(11, FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN)
-                    .build();
-
-    private static final Set<PiTableId> FILTERING_CTRL_TBLS =
-            ImmutableSet.of(FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN,
-                            FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER);
-    private static final Set<PiTableId> FORWARDING_CTRL_TBLS =
-            ImmutableSet.of(FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_ACL);
-    private static final Set<PiTableId> NEXT_CTRL_TBLS =
-            ImmutableSet.of(FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META,
-                            FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE,
-                            FabricConstants.FABRIC_INGRESS_NEXT_HASHED,
-                            FabricConstants.FABRIC_INGRESS_NEXT_MULTICAST);
-    private static final Set<PiTableId> E_NEXT_CTRL_TBLS =
-            ImmutableSet.of(FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN);
+    // Group tables by control block.
+    private static final Set<PiTableId> FILTERING_CTRL_TBLS = ImmutableSet.of(
+            FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN,
+            FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER);
+    private static final Set<PiTableId> FORWARDING_CTRL_TBLS = ImmutableSet.of(
+            FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS,
+            FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
+            FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6,
+            FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING);
+    private static final Set<PiTableId> ACL_CTRL_TBLS = ImmutableSet.of(
+            FabricConstants.FABRIC_INGRESS_ACL_ACL);
+    private static final Set<PiTableId> NEXT_CTRL_TBLS = ImmutableSet.of(
+            FabricConstants.FABRIC_INGRESS_NEXT_NEXT_VLAN,
+            FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE,
+            FabricConstants.FABRIC_INGRESS_NEXT_HASHED);
+    private static final Set<PiTableId> E_NEXT_CTRL_TBLS = ImmutableSet.of(
+            FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN);
 
     private static final ImmutableMap<Criterion.Type, PiMatchFieldId> CRITERION_MAP =
             ImmutableMap.<Criterion.Type, PiMatchFieldId>builder()
-                    .put(Criterion.Type.IN_PORT, FabricConstants.STANDARD_METADATA_INGRESS_PORT)
-                    .put(Criterion.Type.ETH_DST_MASKED, FabricConstants.HDR_ETHERNET_DST_ADDR)
-                    .put(Criterion.Type.ETH_SRC_MASKED, FabricConstants.HDR_ETHERNET_SRC_ADDR)
-                    .put(Criterion.Type.ETH_TYPE, FabricConstants.HDR_VLAN_TAG_ETHER_TYPE)
+                    .put(Criterion.Type.IN_PORT, FabricConstants.HDR_IG_PORT)
+                    .put(Criterion.Type.ETH_DST, FabricConstants.HDR_ETH_DST)
+                    .put(Criterion.Type.ETH_SRC, FabricConstants.HDR_ETH_SRC)
+                    .put(Criterion.Type.ETH_DST_MASKED, FabricConstants.HDR_ETH_DST)
+                    .put(Criterion.Type.ETH_SRC_MASKED, FabricConstants.HDR_ETH_SRC)
+                    .put(Criterion.Type.ETH_TYPE, FabricConstants.HDR_ETH_TYPE)
                     .put(Criterion.Type.MPLS_LABEL, FabricConstants.HDR_MPLS_LABEL)
-                    .put(Criterion.Type.VLAN_VID, FabricConstants.HDR_VLAN_TAG_VLAN_ID)
-                    .put(Criterion.Type.IPV4_DST, FabricConstants.HDR_IPV4_DST_ADDR)
-                    .put(Criterion.Type.IPV4_SRC, FabricConstants.HDR_IPV4_SRC_ADDR)
-                    .put(Criterion.Type.IPV6_DST, FabricConstants.HDR_IPV6_DST_ADDR)
-                    .put(Criterion.Type.IP_PROTO, FabricConstants.FABRIC_METADATA_IP_PROTO)
-                    .put(Criterion.Type.ICMPV6_TYPE, FabricConstants.HDR_ICMP_ICMP_TYPE)
-                    .put(Criterion.Type.ICMPV6_CODE, FabricConstants.HDR_ICMP_ICMP_CODE)
+                    .put(Criterion.Type.VLAN_VID, FabricConstants.HDR_VLAN_ID)
+                    .put(Criterion.Type.IPV4_DST, FabricConstants.HDR_IPV4_DST)
+                    .put(Criterion.Type.IPV4_SRC, FabricConstants.HDR_IPV4_SRC)
+                    .put(Criterion.Type.IPV6_DST, FabricConstants.HDR_IPV6_DST)
+                    .put(Criterion.Type.IP_PROTO, FabricConstants.HDR_IP_PROTO)
+                    .put(Criterion.Type.ICMPV6_TYPE, FabricConstants.HDR_ICMP_TYPE)
+                    .put(Criterion.Type.ICMPV6_CODE, FabricConstants.HDR_ICMP_CODE)
                     .build();
 
     private static final ImmutableMap<PiMatchFieldId, Criterion.Type> INVERSE_CRITERION_MAP =
             ImmutableMap.<PiMatchFieldId, Criterion.Type>builder()
-                    .put(FabricConstants.STANDARD_METADATA_INGRESS_PORT, Criterion.Type.IN_PORT)
-                    .put(FabricConstants.HDR_ETHERNET_DST_ADDR, Criterion.Type.ETH_DST_MASKED)
-                    .put(FabricConstants.HDR_ETHERNET_SRC_ADDR, Criterion.Type.ETH_SRC_MASKED)
-                    .put(FabricConstants.HDR_VLAN_TAG_ETHER_TYPE, Criterion.Type.ETH_TYPE)
+                    .put(FabricConstants.HDR_IG_PORT, Criterion.Type.IN_PORT)
+                    .put(FabricConstants.HDR_ETH_DST, Criterion.Type.ETH_DST_MASKED)
+                    .put(FabricConstants.HDR_ETH_SRC, Criterion.Type.ETH_SRC_MASKED)
+                    .put(FabricConstants.HDR_ETH_TYPE, Criterion.Type.ETH_TYPE)
                     .put(FabricConstants.HDR_MPLS_LABEL, Criterion.Type.MPLS_LABEL)
-                    .put(FabricConstants.HDR_VLAN_TAG_VLAN_ID, Criterion.Type.VLAN_VID)
-                    .put(FabricConstants.HDR_IPV4_DST_ADDR, Criterion.Type.IPV4_DST)
-                    .put(FabricConstants.HDR_IPV4_SRC_ADDR, Criterion.Type.IPV4_SRC)
-                    .put(FabricConstants.HDR_IPV6_DST_ADDR, Criterion.Type.IPV6_DST)
+                    .put(FabricConstants.HDR_VLAN_ID, Criterion.Type.VLAN_VID)
+                    .put(FabricConstants.HDR_IPV4_DST, Criterion.Type.IPV4_DST)
+                    .put(FabricConstants.HDR_IPV4_SRC, Criterion.Type.IPV4_SRC)
+                    .put(FabricConstants.HDR_IPV6_DST, Criterion.Type.IPV6_DST)
                     // FIXME: might be incorrect if we inverse the map....
-                    .put(FabricConstants.FABRIC_METADATA_L4_SRC_PORT, Criterion.Type.UDP_SRC)
-                    .put(FabricConstants.FABRIC_METADATA_L4_DST_PORT, Criterion.Type.UDP_DST)
-                    .put(FabricConstants.FABRIC_METADATA_IP_PROTO, Criterion.Type.IP_PROTO)
-                    .put(FabricConstants.HDR_ICMP_ICMP_TYPE, Criterion.Type.ICMPV6_TYPE)
-                    .put(FabricConstants.HDR_ICMP_ICMP_CODE, Criterion.Type.ICMPV6_CODE)
+                    .put(FabricConstants.HDR_L4_SPORT, Criterion.Type.UDP_SRC)
+                    .put(FabricConstants.HDR_L4_DPORT, Criterion.Type.UDP_DST)
+                    .put(FabricConstants.HDR_IP_PROTO, Criterion.Type.IP_PROTO)
+                    .put(FabricConstants.HDR_ICMP_TYPE, Criterion.Type.ICMPV6_TYPE)
+                    .put(FabricConstants.HDR_ICMP_CODE, Criterion.Type.ICMPV6_CODE)
                     .build();
 
-    private static final PiAction NOACTION = PiAction.builder().withId(
-            FabricConstants.NO_ACTION).build();
+    private static final PiAction NOP = PiAction.builder()
+            .withId(FabricConstants.NOP).build();
 
     private static final ImmutableMap<PiTableId, PiAction> DEFAULT_ACTIONS =
             ImmutableMap.<PiTableId, PiAction>builder()
-                    .put(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4, NOACTION)
+                    .put(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4, NOP)
                     .build();
 
     @Override
@@ -167,32 +137,39 @@
 
     @Override
     public Optional<PiTableId> mapFlowRuleTableId(int flowRuleTableId) {
-        return Optional.ofNullable(TABLE_ID_MAP.get(flowRuleTableId));
+        // The only use case for Index ID->PiTableId is when using the single
+        // table pipeliner. fabric.p4 is never used with such pipeliner.
+        return Optional.empty();
     }
 
     @Override
     public Optional<Integer> mapPiTableId(PiTableId piTableId) {
-        return Optional.ofNullable(TABLE_ID_MAP.inverse().get(piTableId));
+        // The only use case for Index ID->PiTableId is when using the single
+        // table pipeliner. fabric.p4 is never used with such pipeliner.
+        return Optional.empty();
     }
 
     @Override
     public PiAction mapTreatment(TrafficTreatment treatment, PiTableId piTableId)
             throws PiInterpreterException {
-
         if (FILTERING_CTRL_TBLS.contains(piTableId)) {
             return FabricTreatmentInterpreter.mapFilteringTreatment(treatment, piTableId);
         } else if (FORWARDING_CTRL_TBLS.contains(piTableId)) {
             return FabricTreatmentInterpreter.mapForwardingTreatment(treatment, piTableId);
+        } else if (ACL_CTRL_TBLS.contains(piTableId)) {
+            return FabricTreatmentInterpreter.mapAclTreatment(treatment, piTableId);
         } else if (NEXT_CTRL_TBLS.contains(piTableId)) {
             return FabricTreatmentInterpreter.mapNextTreatment(treatment, piTableId);
         } else if (E_NEXT_CTRL_TBLS.contains(piTableId)) {
             return FabricTreatmentInterpreter.mapEgressNextTreatment(treatment, piTableId);
         } else {
-            throw new PiInterpreterException(String.format("Table %s unsupported", piTableId));
+            throw new PiInterpreterException(format(
+                    "Treatment mapping not supported for table '%s'", piTableId));
         }
     }
 
-    private PiPacketOperation createPiPacketOperation(DeviceId deviceId, ByteBuffer data, long portNumber)
+    private PiPacketOperation createPiPacketOperation(
+            DeviceId deviceId, ByteBuffer data, long portNumber)
             throws PiInterpreterException {
         PiControlMetadata metadata = createPacketMetadata(portNumber);
         return PiPacketOperation.builder()
@@ -203,7 +180,8 @@
                 .build();
     }
 
-    private PiControlMetadata createPacketMetadata(long portNumber) throws PiInterpreterException {
+    private PiControlMetadata createPacketMetadata(long portNumber)
+            throws PiInterpreterException {
         try {
             return PiControlMetadata.builder()
                     .withId(FabricConstants.EGRESS_PORT)
@@ -211,7 +189,7 @@
                     .build();
         } catch (ImmutableByteSequence.ByteSequenceTrimException e) {
             throw new PiInterpreterException(format(
-                    "Port number %d too big, %s", portNumber, e.getMessage()));
+                    "Port number '%d' too big, %s", portNumber, e.getMessage()));
         }
     }
 
@@ -294,49 +272,6 @@
         if (!port.equals(CONTROLLER)) {
             return Optional.empty();
         }
-        // This is probably brittle, but needed to dynamically get the CPU port
-        // for different platforms.
-        final DeviceId deviceId = data().deviceId();
-        final PiPipeconfService pipeconfService = handler().get(
-                PiPipeconfService.class);
-        final PiPipeconfId pipeconfId = pipeconfService
-                .ofDevice(deviceId).orElse(null);
-        if (pipeconfId == null ||
-                !pipeconfService.getPipeconf(pipeconfId).isPresent()) {
-            log.error("Unable to get pipeconf of {} - BUG?");
-            return Optional.empty();
-        }
-        final PiPipeconf pipeconf = pipeconfService.getPipeconf(pipeconfId).get();
-        if (!pipeconf.extension(CPU_PORT_TXT).isPresent()) {
-            log.error("Missing {} extension from pipeconf {}",
-                      CPU_PORT_TXT, pipeconfId);
-            return Optional.empty();
-        }
-        return Optional.ofNullable(
-                readCpuPort(pipeconf.extension(CPU_PORT_TXT).get(),
-                            pipeconfId));
-    }
-
-    private Integer readCpuPort(InputStream stream, PiPipeconfId pipeconfId) {
-        try {
-            final BufferedReader buff = new BufferedReader(
-                    new InputStreamReader(stream));
-            final String str = buff.readLine();
-            buff.close();
-            if (str == null) {
-                log.error("Empty CPU port file for {}", pipeconfId);
-                return null;
-            }
-            try {
-                return Integer.parseInt(str);
-            } catch (NumberFormatException e) {
-                log.error("Invalid CPU port for {}: {}", pipeconfId, str);
-                return null;
-            }
-        } catch (IOException e) {
-            log.error("Unable to read CPU port file of {}: {}",
-                      pipeconfId, e.getMessage());
-            return null;
-        }
+        return capabilities.cpuPort();
     }
 }
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
index 818fb43..4248111 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
@@ -16,371 +16,241 @@
 
 package org.onosproject.pipelines.fabric;
 
-import com.google.common.collect.ImmutableList;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.MplsLabel;
-import org.onlab.packet.VlanId;
-import org.onlab.util.ImmutableByteSequence;
+import com.google.common.collect.ImmutableMap;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.instructions.Instruction;
-import org.onosproject.net.flow.instructions.Instructions;
 import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModEtherInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModMplsLabelInstruction;
 import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanIdInstruction;
-import org.onosproject.net.flow.instructions.L3ModificationInstruction;
 import org.onosproject.net.pi.model.PiActionId;
 import org.onosproject.net.pi.model.PiPipelineInterpreter.PiInterpreterException;
 import org.onosproject.net.pi.model.PiTableId;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
-import org.slf4j.Logger;
-
-import java.util.List;
 
 import static java.lang.String.format;
-import static org.onosproject.net.flow.instructions.Instruction.Type.L2MODIFICATION;
+import static org.onosproject.net.flow.instructions.Instruction.Type.OUTPUT;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.ETH_DST;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.ETH_SRC;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.MPLS_LABEL;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.MPLS_PUSH;
 import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_ID;
-import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_PUSH;
-import static org.onosproject.pipelines.fabric.FabricUtils.getOutputPort;
-import static org.slf4j.LoggerFactory.getLogger;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_POP;
+import static org.onosproject.pipelines.fabric.FabricUtils.instruction;
+import static org.onosproject.pipelines.fabric.FabricUtils.l2Instruction;
+import static org.onosproject.pipelines.fabric.FabricUtils.outputPort;
 
-
+/**
+ * Treatment translation logic.
+ */
 final class FabricTreatmentInterpreter {
-    private static final Logger log = getLogger(FabricTreatmentInterpreter.class);
-    private static final String INVALID_TREATMENT = "Invalid treatment for %s block [%s]";
-    private static final String INVALID_TREATMENT_WITH_EXP = "Invalid treatment for %s block: %s [%s]";
-    private static final PiAction NOP = PiAction.builder().withId(FabricConstants.NOP).build();
-    private static final PiAction NOP_INGRESS_PORT_VLAN = PiAction.builder()
-            .withId(FabricConstants.FABRIC_INGRESS_FILTERING_NOP_INGRESS_PORT_VLAN).build();
-    private static final PiAction NOP_ACL = PiAction.builder()
-            .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ACL).build();
-    private static final PiAction NOP_ROUTING_V4 = PiAction.builder()
-            .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ROUTING_V4).build();
 
-    private static final PiAction POP_VLAN = PiAction.builder()
-            .withId(FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN)
-            .build();
+    private static final ImmutableMap<PiTableId, PiActionId> NOP_ACTIONS =
+            ImmutableMap.<PiTableId, PiActionId>builder()
+                    .put(FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN,
+                         FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT)
+                    .put(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
+                         FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ROUTING_V4)
+                    .put(FabricConstants.FABRIC_INGRESS_ACL_ACL,
+                         FabricConstants.FABRIC_INGRESS_ACL_NOP_ACL)
+                    .put(FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN,
+                         FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN)
+                    .build();
 
-    // Hide default constructor
-    protected FabricTreatmentInterpreter() {
+    private FabricTreatmentInterpreter() {
+        // Hide default constructor
     }
 
-    /*
-     * In Filtering block, we need to implement these actions:
-     * push_internal_vlan
-     * set_vlan
-     * nop
-     *
-     * Unsupported, using PiAction directly:
-     * set_forwarding_type
-     * drop
-     */
-
     static PiAction mapFilteringTreatment(TrafficTreatment treatment, PiTableId tableId)
             throws PiInterpreterException {
-        List<Instruction> instructions = treatment.allInstructions();
-        Instruction noActInst = Instructions.createNoAction();
-        if (instructions.isEmpty() || instructions.contains(noActInst)) {
-            // nop
-            return NOP_INGRESS_PORT_VLAN;
+
+        if (!tableId.equals(FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN)) {
+            // Mapping for other tables of the filtering block must be handled
+            // in the pipeliner.
+            tableException(tableId);
         }
 
-        L2ModificationInstruction.ModVlanHeaderInstruction pushVlanInst = null;
-        ModVlanIdInstruction setVlanInst = null;
-
-        for (Instruction inst : instructions) {
-            if (inst.type() == L2MODIFICATION) {
-                L2ModificationInstruction l2Inst = (L2ModificationInstruction) inst;
-
-                if (l2Inst.subtype() == VLAN_PUSH) {
-                    pushVlanInst = (L2ModificationInstruction.ModVlanHeaderInstruction) l2Inst;
-
-                } else if (l2Inst.subtype() == VLAN_ID) {
-                    setVlanInst = (ModVlanIdInstruction) l2Inst;
-                }
-            }
+        if (isNoAction(treatment)) {
+            // Permit action if table is ingress_port_vlan;
+            return nop(tableId);
         }
 
-        if (setVlanInst == null) {
-            throw new PiInterpreterException(format(INVALID_TREATMENT, "filtering", treatment));
-        }
-
-        VlanId vlanId = setVlanInst.vlanId();
-        PiActionParam param = new PiActionParam(FabricConstants.NEW_VLAN_ID,
-                                                ImmutableByteSequence.copyFrom(vlanId.toShort()));
-        PiActionId actionId;
-        if (pushVlanInst != null) {
-            // push_internal_vlan
-            actionId = FabricConstants.FABRIC_INGRESS_FILTERING_PUSH_INTERNAL_VLAN;
-        } else {
-            actionId = FabricConstants.FABRIC_INGRESS_FILTERING_SET_VLAN;
-        }
-
-        // set_vlan
+        final ModVlanIdInstruction setVlanInst = (ModVlanIdInstruction) l2InstructionOrFail(
+                treatment, VLAN_ID, tableId);
         return PiAction.builder()
-                .withId(actionId)
-                .withParameter(param)
+                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN)
+                .withParameter(new PiActionParam(
+                        FabricConstants.VLAN_ID, setVlanInst.vlanId().toShort()))
                 .build();
     }
 
-    /*
-     * In forwarding block, we need to implement these actions:
-     * send_to_controller
-     *
-     * Unsupported, using PiAction directly:
-     * set_next_id_bridging
-     * pop_mpls_and_next
-     * set_next_id_unicast_v4
-     * set_next_id_multicast_v4
-     * set_next_id_acl
-     * drop
-     * set_next_id_unicast_v6
-     * set_next_id_multicast_v6
-     */
 
-    public static PiAction mapForwardingTreatment(TrafficTreatment treatment, PiTableId tableId)
+    static PiAction mapForwardingTreatment(TrafficTreatment treatment, PiTableId tableId)
             throws PiInterpreterException {
-        // Empty treatment, generate table entry with no action
-        if (treatment.equals(DefaultTrafficTreatment.emptyTreatment()) ||
-                treatment.allInstructions().isEmpty()) {
-            if (tableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)) {
-                return NOP_ACL;
-            } else if (tableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4)) {
-                return NOP_ROUTING_V4;
-            } else {
-                return NOP;
-            }
+        if (isNoAction(treatment)) {
+            return nop(tableId);
         }
-        PortNumber outPort = getOutputPort(treatment);
+        treatmentException(
+                tableId, treatment,
+                "supports mapping only for empty/no-action treatments");
+        return null;
+    }
+
+    static PiAction mapNextTreatment(TrafficTreatment treatment, PiTableId tableId)
+            throws PiInterpreterException {
+        if (tableId == FabricConstants.FABRIC_INGRESS_NEXT_NEXT_VLAN) {
+            return mapNextVlanTreatment(treatment, tableId);
+        } else if (tableId == FabricConstants.FABRIC_INGRESS_NEXT_HASHED) {
+            return mapNextHashedOrSimpleTreatment(treatment, tableId, false);
+        } else if (tableId == FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE) {
+            return mapNextHashedOrSimpleTreatment(treatment, tableId, true);
+        }
+        throw new PiInterpreterException(format(
+                "Treatment mapping not supported for table '%s'", tableId));
+    }
+
+    private static PiAction mapNextVlanTreatment(TrafficTreatment treatment, PiTableId tableId)
+            throws PiInterpreterException {
+        final ModVlanIdInstruction modVlanIdInst = (ModVlanIdInstruction)
+                l2InstructionOrFail(treatment, VLAN_ID, tableId);
+        return PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN)
+                .withParameter(new PiActionParam(
+                        FabricConstants.VLAN_ID,
+                        modVlanIdInst.vlanId().toShort()))
+                .build();
+    }
+
+    private static PiAction mapNextHashedOrSimpleTreatment(
+            TrafficTreatment treatment, PiTableId tableId, boolean simple)
+            throws PiInterpreterException {
+        // Provide mapping for output_hashed, routing_hashed, and
+        // mpls_routing_hashed. multicast_hashed can only be invoked with
+        // PiAction, hence no mapping. outPort required for all actions. Presence
+        // of other instructions will determine which action to map to.
+        final PortNumber outPort = ((OutputInstruction) instructionOrFail(
+                treatment, OUTPUT, tableId)).port();
+        final ModEtherInstruction ethDst = (ModEtherInstruction) l2Instruction(
+                treatment, ETH_DST);
+        final ModEtherInstruction ethSrc = (ModEtherInstruction) l2Instruction(
+                treatment, ETH_SRC);
+        final Instruction mplsPush = l2Instruction(
+                treatment, MPLS_PUSH);
+        final ModMplsLabelInstruction mplsLabel = (ModMplsLabelInstruction) l2Instruction(
+                treatment, MPLS_LABEL);
+
+        final PiAction.Builder actionBuilder = PiAction.builder()
+                .withParameter(new PiActionParam(FabricConstants.PORT_NUM, outPort.toLong()));
+
+        if (ethDst != null && ethSrc != null) {
+            actionBuilder.withParameter(new PiActionParam(
+                    FabricConstants.SMAC, ethSrc.mac().toBytes()));
+            actionBuilder.withParameter(new PiActionParam(
+                    FabricConstants.DMAC, ethDst.mac().toBytes()));
+            if (mplsLabel != null) {
+                // mpls_routing_hashed
+                return actionBuilder
+                        .withParameter(new PiActionParam(FabricConstants.LABEL, mplsLabel.label().toInt()))
+                        .withId(simple ? FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_SIMPLE
+                                        : FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_HASHED)
+                        .build();
+            } else {
+                // routing_hashed
+                return actionBuilder
+                        .withId(simple ? FabricConstants.FABRIC_INGRESS_NEXT_ROUTING_SIMPLE
+                                        : FabricConstants.FABRIC_INGRESS_NEXT_ROUTING_HASHED)
+                        .build();
+            }
+        } else {
+            // output_hashed
+            return actionBuilder
+                    .withId(simple ? FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE
+                                    : FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_HASHED)
+                    .build();
+        }
+    }
+
+    static PiAction mapAclTreatment(TrafficTreatment treatment, PiTableId tableId)
+            throws PiInterpreterException {
+        if (isNoAction(treatment)) {
+            return nop(tableId);
+        }
+
+        final PortNumber outPort = outputPort(treatment);
         if (outPort == null
                 || !outPort.equals(PortNumber.CONTROLLER)
                 || treatment.allInstructions().size() > 1) {
-            throw new PiInterpreterException(
-                    format(INVALID_TREATMENT_WITH_EXP,
-                           "forwarding", "supports only punt/clone to CPU actions",
-                           treatment));
+            treatmentException(
+                    tableId, treatment,
+                    "supports only punt/clone to CPU actions");
         }
 
         final PiActionId actionId = treatment.clearedDeferred()
-                ? FabricConstants.FABRIC_INGRESS_FORWARDING_PUNT_TO_CPU
-                : FabricConstants.FABRIC_INGRESS_FORWARDING_CLONE_TO_CPU;
+                ? FabricConstants.FABRIC_INGRESS_ACL_PUNT_TO_CPU
+                : FabricConstants.FABRIC_INGRESS_ACL_CLONE_TO_CPU;
 
         return PiAction.builder()
                 .withId(actionId)
                 .build();
     }
 
-    /*
-     * In Next block, we need to implement these actions:
-     * set_vlan
-     * set_vlan_output
-     * output_simple
-     * output_hashed
-     * l3_routing_simple
-     * l3_routing_vlan
-     * l3_routing_hashed
-     * mpls_routing_v4_simple
-     * mpls_routing_v6_simple
-     * mpls_routing_v4_hashed
-     * mpls_routing_v6_hashed
-     *
-     * Unsupported, need to find a way to implement it
-     *
-     * set_mcast_group
-     *
-     */
 
-    public static PiAction mapNextTreatment(TrafficTreatment treatment, PiTableId tableId)
+    static PiAction mapEgressNextTreatment(
+            TrafficTreatment treatment, PiTableId tableId)
             throws PiInterpreterException {
-        // TODO: refactor this method
-        List<Instruction> insts = treatment.allInstructions();
-        OutputInstruction outInst = null;
-        ModEtherInstruction modEthDstInst = null;
-        ModEtherInstruction modEthSrcInst = null;
-        ModVlanIdInstruction modVlanIdInst = null;
-        ModMplsLabelInstruction modMplsInst = null;
+        l2InstructionOrFail(treatment, VLAN_POP, tableId);
+        return PiAction.builder()
+                .withId(FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN)
+                .build();
 
-        // TODO: add NextFunctionType (like ForwardingFunctionType)
-        for (Instruction inst : insts) {
-            switch (inst.type()) {
-                case L2MODIFICATION:
-                    L2ModificationInstruction l2Inst = (L2ModificationInstruction) inst;
-                    switch (l2Inst.subtype()) {
-                        case ETH_SRC:
-                            modEthSrcInst = (ModEtherInstruction) l2Inst;
-                            break;
-                        case ETH_DST:
-                            modEthDstInst = (ModEtherInstruction) l2Inst;
-                            break;
-                        case VLAN_ID:
-                            modVlanIdInst = (ModVlanIdInstruction) l2Inst;
-                            break;
-                        case MPLS_LABEL:
-                            modMplsInst = (ModMplsLabelInstruction) l2Inst;
-                            break;
-                        case VLAN_POP:
-                            // VLAN_POP will be handled by mapEgressNextTreatment()
-                            break;
-                        case MPLS_PUSH:
-                            // Ignore. fabric.p4 only needs MPLS_LABEL to push a label
-                            break;
-                        default:
-                            log.warn("Unsupported l2 instruction sub type {} [table={}, {}]",
-                                     l2Inst.subtype(), tableId, treatment);
-                            break;
-                    }
-                    break;
-                case L3MODIFICATION:
-                    L3ModificationInstruction l3Inst = (L3ModificationInstruction) inst;
-                    switch (l3Inst.subtype()) {
-                        case TTL_OUT:
-                            // Ignore TTL_OUT
-                            break;
-                        default:
-                            log.warn("Unsupported l3 instruction sub type {} [table={}, {}]",
-                                    l3Inst.subtype(), tableId, treatment);
-                            break;
-                    }
-                    break;
-                case OUTPUT:
-                    outInst = (OutputInstruction) inst;
-                    break;
-                default:
-                    log.warn("Unsupported instruction sub type {} [table={}, {}]",
-                             inst.type(), tableId, treatment);
-                    break;
-            }
-        }
-
-        if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META) &&
-                modVlanIdInst != null) {
-            // set_vlan
-            VlanId vlanId = modVlanIdInst.vlanId();
-            PiActionParam newVlanParam =
-                    new PiActionParam(FabricConstants.NEW_VLAN_ID,
-                                      ImmutableByteSequence.copyFrom(vlanId.toShort()));
-            return PiAction.builder()
-                    .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN)
-                    .withParameter(newVlanParam)
-                    .build();
-        }
-
-        if (outInst == null) {
-            throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
-        }
-
-        short portNum = (short) outInst.port().toLong();
-        PiActionParam portNumParam = new PiActionParam(FabricConstants.PORT_NUM,
-                                                       ImmutableByteSequence.copyFrom(portNum));
-        if (modEthDstInst == null && modEthSrcInst == null) {
-            if (modVlanIdInst != null) {
-                VlanId vlanId = modVlanIdInst.vlanId();
-                PiActionParam vlanParam =
-                        new PiActionParam(FabricConstants.NEW_VLAN_ID,
-                                          ImmutableByteSequence.copyFrom(vlanId.toShort()));
-                // set_vlan_output (simple table)
-                return PiAction.builder()
-                        .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT)
-                        .withParameters(ImmutableList.of(portNumParam, vlanParam))
-                        .build();
-            } else {
-                // output (simple or hashed table)
-                return PiAction.builder()
-                        .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE)
-                        .withParameter(portNumParam)
-                        .build();
-            }
-        }
-
-        if (modEthDstInst != null && modEthSrcInst != null) {
-            MacAddress srcMac = modEthSrcInst.mac();
-            MacAddress dstMac = modEthDstInst.mac();
-            PiActionParam srcMacParam = new PiActionParam(FabricConstants.SMAC,
-                                                          ImmutableByteSequence.copyFrom(srcMac.toBytes()));
-            PiActionParam dstMacParam = new PiActionParam(FabricConstants.DMAC,
-                                                          ImmutableByteSequence.copyFrom(dstMac.toBytes()));
-
-            if (modMplsInst != null) {
-                // MPLS routing
-                MplsLabel mplsLabel = modMplsInst.label();
-                try {
-                    ImmutableByteSequence mplsValue =
-                            ImmutableByteSequence.copyFrom(mplsLabel.toInt()).fit(20);
-                    PiActionParam mplsParam = new PiActionParam(FabricConstants.LABEL, mplsValue);
-
-                    PiActionId actionId;
-                    // FIXME: finds a way to determine v4 or v6
-                    if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)) {
-                        actionId = FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_SIMPLE;
-                    } else if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_HASHED)) {
-                        actionId = FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED;
-                    } else {
-                        throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
-                    }
-
-                    return PiAction.builder()
-                            .withId(actionId)
-                            .withParameters(ImmutableList.of(portNumParam,
-                                                             srcMacParam,
-                                                             dstMacParam,
-                                                             mplsParam))
-                            .build();
-                } catch (ImmutableByteSequence.ByteSequenceTrimException e) {
-                    // Basically this won't happened because we already limited
-                    // size of mpls value to 20 bits (0xFFFFF)
-                    throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
-                }
-            }
-
-            if (modVlanIdInst != null) {
-                VlanId vlanId = modVlanIdInst.vlanId();
-                PiActionParam vlanParam =
-                        new PiActionParam(FabricConstants.NEW_VLAN_ID,
-                                          ImmutableByteSequence.copyFrom(vlanId.toShort()));
-                // L3 routing and set VLAN
-                return PiAction.builder()
-                        .withId(FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN)
-                        .withParameters(ImmutableList.of(srcMacParam, dstMacParam, portNumParam, vlanParam))
-                        .build();
-            } else {
-                PiActionId actionId;
-                if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)) {
-                    actionId = FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING_SIMPLE;
-                } else if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_HASHED)) {
-                    actionId = FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING_HASHED;
-                } else {
-                    throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
-                }
-
-                // L3 routing
-                return PiAction.builder()
-                        .withId(actionId)
-                        .withParameters(ImmutableList.of(portNumParam,
-                                                         srcMacParam,
-                                                         dstMacParam))
-                        .build();
-            }
-        }
-
-        throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
     }
 
-    /*
-     * pop_vlan
-     */
-    public static PiAction mapEgressNextTreatment(TrafficTreatment treatment, PiTableId tableId) {
-        // Pop VLAN action for now, may add new action to this control block in the future.
-        return treatment.allInstructions()
-                .stream()
-                .filter(inst -> inst.type() == Instruction.Type.L2MODIFICATION)
-                .map(inst -> (L2ModificationInstruction) inst)
-                .filter(inst -> inst.subtype() == L2ModificationInstruction.L2SubType.VLAN_POP)
-                .findFirst()
-                .map(inst -> POP_VLAN)
-                .orElse(NOP);
+    private static PiAction nop(PiTableId tableId) throws PiInterpreterException {
+        if (!NOP_ACTIONS.containsKey(tableId)) {
+            throw new PiInterpreterException(format("table '%s' doe not specify a nop action", tableId));
+        }
+        return PiAction.builder().withId(NOP_ACTIONS.get(tableId)).build();
+    }
+
+    private static boolean isNoAction(TrafficTreatment treatment) {
+        return treatment.equals(DefaultTrafficTreatment.emptyTreatment()) ||
+                treatment.allInstructions().isEmpty();
+    }
+
+    private static Instruction l2InstructionOrFail(
+            TrafficTreatment treatment,
+            L2ModificationInstruction.L2SubType subType, PiTableId tableId)
+            throws PiInterpreterException {
+        final Instruction inst = l2Instruction(treatment, subType);
+        if (inst == null) {
+            treatmentException(tableId, treatment, format("missing %s instruction", subType));
+        }
+        return inst;
+    }
+
+    private static Instruction instructionOrFail(
+            TrafficTreatment treatment, Instruction.Type type, PiTableId tableId)
+            throws PiInterpreterException {
+        final Instruction inst = instruction(treatment, type);
+        if (inst == null) {
+            treatmentException(tableId, treatment, format("missing %s instruction", type));
+        }
+        return inst;
+    }
+
+    private static void tableException(PiTableId tableId)
+            throws PiInterpreterException {
+        throw new PiInterpreterException(format("Table '%s' not supported", tableId));
+    }
+
+    private static void treatmentException(
+            PiTableId tableId, TrafficTreatment treatment, String explanation)
+            throws PiInterpreterException {
+        throw new PiInterpreterException(format(
+                "Invalid treatment for table '%s', %s: %s", tableId, explanation, treatment));
     }
 }
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricUtils.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricUtils.java
index b644613..8e5caa1 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricUtils.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricUtils.java
@@ -17,14 +17,22 @@
 package org.onosproject.pipelines.fabric;
 
 import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.flow.instructions.Instructions;
+import org.onosproject.net.flow.instructions.L2ModificationInstruction;
+import org.onosproject.net.flowobjective.DefaultNextTreatment;
+import org.onosproject.net.flowobjective.NextTreatment;
 
-import java.util.Optional;
+import java.util.Collection;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
 
 /**
- * Utility class for fabric pipeliner.
+ * Utility class with methods common to fabric pipeconf operations.
  */
 public final class FabricUtils {
 
@@ -32,17 +40,57 @@
         // Hides constructor.
     }
 
-    public static Optional<Instructions.OutputInstruction> getOutputInstruction(TrafficTreatment treatment) {
-        return treatment.allInstructions()
-                .stream()
-                .filter(inst -> inst.type() == Instruction.Type.OUTPUT)
-                .map(inst -> (Instructions.OutputInstruction) inst)
-                .findFirst();
+    public static Criterion criterion(Collection<Criterion> criteria, Criterion.Type type) {
+        return criteria.stream()
+                .filter(c -> c.type().equals(type))
+                .findFirst().orElse(null);
     }
 
-    public static PortNumber getOutputPort(TrafficTreatment treatment) {
-        return getOutputInstruction(treatment)
-                .map(Instructions.OutputInstruction::port)
-                .orElse(null);
+    public static Criterion criterion(TrafficSelector selector, Criterion.Type type) {
+        return selector.getCriterion(type);
+    }
+
+    public static Criterion criterionNotNull(TrafficSelector selector, Criterion.Type type) {
+        return checkNotNull(criterion(selector, type),
+                            format("%s criterion cannot be null", type));
+    }
+
+    public static Criterion criterionNotNull(Collection<Criterion> criteria, Criterion.Type type) {
+        return checkNotNull(criterion(criteria, type),
+                            format("%s criterion cannot be null", type));
+    }
+
+    public static Instructions.OutputInstruction instruction(TrafficTreatment treatment, Instruction.Type type) {
+        return treatment.allInstructions()
+                .stream()
+                .filter(inst -> inst.type() == type)
+                .map(inst -> (Instructions.OutputInstruction) inst)
+                .findFirst().orElse(null);
+    }
+
+    public static L2ModificationInstruction l2Instruction(
+            TrafficTreatment treatment, L2ModificationInstruction.L2SubType subType) {
+        return treatment.allInstructions().stream()
+                .filter(i -> i.type().equals(Instruction.Type.L2MODIFICATION))
+                .map(i -> (L2ModificationInstruction) i)
+                .filter(i -> i.subtype().equals(subType))
+                .findFirst().orElse(null);
+    }
+
+    public static Instructions.OutputInstruction outputInstruction(TrafficTreatment treatment) {
+        return instruction(treatment, Instruction.Type.OUTPUT);
+    }
+
+    public static PortNumber outputPort(TrafficTreatment treatment) {
+        final Instructions.OutputInstruction inst = outputInstruction(treatment);
+        return inst == null ? null : inst.port();
+    }
+
+    public static PortNumber outputPort(NextTreatment treatment) {
+        if (treatment.type() == NextTreatment.Type.TREATMENT) {
+            final DefaultNextTreatment t = (DefaultNextTreatment) treatment;
+            return outputPort(t.treatment());
+        }
+        return null;
     }
 }
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
index 89653d8..b565c99 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/PipeconfLoader.java
@@ -153,7 +153,7 @@
         }
         // Add IntProgrammable behaviour for INT-enabled profiles.
         if (profile.endsWith(INT_PROFILE_SUFFIX) || profile.endsWith(FULL_PROFILE_SUFFIX)) {
-            pipeconfBuilder.addBehaviour(IntProgrammable.class, IntProgrammableImpl.class);
+            pipeconfBuilder.addBehaviour(IntProgrammable.class, FabricIntProgrammable.class);
         }
         return pipeconfBuilder.build();
     }
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/package-info.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/package-info.java
index 1cd2d1f..2221ac3 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/package-info.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * CORD underlay fabric pipeline.
+ * Trellis-compatible reference underlay pipeconf.
  */
 package org.onosproject.pipelines.fabric;
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/AbstractObjectiveTranslator.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/AbstractObjectiveTranslator.java
new file mode 100644
index 0000000..c1e2f4d
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/AbstractObjectiveTranslator.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.pipeliner;
+
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.flow.DefaultFlowRule;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.flowobjective.Objective;
+import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.pi.model.PiPipelineInterpreter;
+import org.onosproject.net.pi.model.PiTableId;
+import org.onosproject.net.pi.runtime.PiAction;
+import org.onosproject.pipelines.fabric.FabricCapabilities;
+import org.onosproject.pipelines.fabric.FabricInterpreter;
+import org.slf4j.Logger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Abstract implementation of a pipeliner logic for the fabric pipeconf.
+ */
+abstract class AbstractObjectiveTranslator<T extends Objective> {
+
+    protected final Logger log = getLogger(this.getClass());
+
+    protected final FabricCapabilities capabilities;
+    protected final DeviceId deviceId;
+
+    private final PiPipelineInterpreter interpreter = new FabricInterpreter();
+
+    AbstractObjectiveTranslator(DeviceId deviceId, FabricCapabilities capabilities) {
+        this.deviceId = checkNotNull(deviceId);
+        this.capabilities = checkNotNull(capabilities);
+    }
+
+    public ObjectiveTranslation translate(T obj) {
+        try {
+            return doTranslate(obj);
+        } catch (FabricPipelinerException e) {
+            log.warn("Cannot translate {}: {} [{}]",
+                     obj.getClass().getSimpleName(), e.getMessage(), obj);
+            return ObjectiveTranslation.ofError(e.objectiveError());
+        }
+    }
+
+    public abstract ObjectiveTranslation doTranslate(T obj)
+            throws FabricPipelinerException;
+
+    public FlowRule flowRule(T obj, PiTableId tableId, TrafficSelector selector,
+                             TrafficTreatment treatment)
+            throws FabricPipelinerException {
+        return DefaultFlowRule.builder()
+                .withSelector(selector)
+                .withTreatment(mapTreatmentToPiIfNeeded(treatment, tableId))
+                .forTable(tableId)
+                .makePermanent()
+                .withPriority(obj.priority())
+                .forDevice(deviceId)
+                .fromApp(obj.appId())
+                .build();
+    }
+
+    TrafficTreatment mapTreatmentToPiIfNeeded(TrafficTreatment treatment, PiTableId tableId)
+            throws FabricPipelinerException {
+        if (isTreatmentPi(treatment)) {
+            return treatment;
+        }
+        final PiAction piAction;
+        try {
+            piAction = interpreter.mapTreatment(treatment, tableId);
+        } catch (PiPipelineInterpreter.PiInterpreterException ex) {
+            throw new FabricPipelinerException(
+                    format("Unable to map treatment for table '%s': %s",
+                           tableId, ex.getMessage()),
+                    ObjectiveError.UNSUPPORTED);
+        }
+        return DefaultTrafficTreatment.builder()
+                .piTableAction(piAction)
+                .build();
+    }
+
+    private boolean isTreatmentPi(TrafficTreatment treatment) {
+        return treatment.allInstructions().size() == 1
+                && treatment.allInstructions().get(0).type() == Instruction.Type.PROTOCOL_INDEPENDENT;
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
deleted file mode 100644
index 7d6ad40..0000000
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.pipelines.fabric.pipeliner;
-
-import com.google.common.collect.Lists;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onlab.util.ImmutableByteSequence;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flow.DefaultFlowRule;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.criteria.Criterion;
-import org.onosproject.net.flow.criteria.EthCriterion;
-import org.onosproject.net.flow.criteria.PiCriterion;
-import org.onosproject.net.flow.criteria.PortCriterion;
-import org.onosproject.net.flow.criteria.VlanIdCriterion;
-import org.onosproject.net.flowobjective.FilteringObjective;
-import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.net.pi.runtime.PiAction;
-import org.onosproject.net.pi.runtime.PiActionParam;
-import org.onosproject.pipelines.fabric.FabricConstants;
-import org.slf4j.Logger;
-
-import java.util.Collection;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Handling filtering objective for fabric pipeliner.
- */
-public class FabricFilteringPipeliner {
-    private static final Logger log = getLogger(FabricFilteringPipeliner.class);
-    // Forwarding types
-    static final byte FWD_BRIDGING = 0;
-    static final byte FWD_MPLS = 1;
-    static final byte FWD_IPV4_ROUTING = 2;
-    static final byte FWD_IPV6_ROUTING = 3;
-    private static final PiCriterion VLAN_VALID = PiCriterion.builder()
-            .matchExact(FabricConstants.HDR_VLAN_TAG_IS_VALID, new byte[]{1})
-            .build();
-    private static final PiCriterion VLAN_INVALID = PiCriterion.builder()
-            .matchExact(FabricConstants.HDR_VLAN_TAG_IS_VALID, new byte[]{0})
-            .build();
-
-    protected DeviceId deviceId;
-
-    public FabricFilteringPipeliner(DeviceId deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    /**
-     * Translates filtering objective to flows and groups.
-     *
-     * @param filterObjective the filtering objective
-     * @return translation result, contains flows, groups or error it generated
-     */
-    public PipelinerTranslationResult filter(FilteringObjective filterObjective) {
-        PipelinerTranslationResult.Builder resultBuilder = PipelinerTranslationResult.builder();
-        // maps selector and treatment from filtering objective to filtering
-        // control block.
-
-        if (filterObjective.type() == FilteringObjective.Type.DENY) {
-            log.warn("Unsupported filtering objective type {}", filterObjective.type());
-            resultBuilder.setError(ObjectiveError.UNSUPPORTED);
-            return resultBuilder.build();
-        }
-
-        if (filterObjective.key() == null ||
-                filterObjective.key().type() != Criterion.Type.IN_PORT) {
-            log.warn("Unsupported filter key {}", filterObjective.key());
-            resultBuilder.setError(ObjectiveError.BADPARAMS);
-            return resultBuilder.build();
-        }
-        PortCriterion inPortCriterion = (PortCriterion) filterObjective.key();
-        VlanIdCriterion vlanCriterion = filterObjective.conditions().stream()
-                .filter(criterion -> criterion.type() == Criterion.Type.VLAN_VID)
-                .map(criterion -> (VlanIdCriterion) criterion)
-                .findFirst()
-                .orElse(null);
-        EthCriterion ethDstCriterion = filterObjective.conditions().stream()
-                .filter(criterion -> criterion.type() == Criterion.Type.ETH_DST)
-                .map(criterion -> (EthCriterion) criterion)
-                .findFirst()
-                .orElse(null);
-        EthCriterion ethDstMaskedCriterion = filterObjective.conditions().stream()
-                .filter(criterion -> criterion.type() == Criterion.Type.ETH_DST_MASKED)
-                .map(criterion -> (EthCriterion) criterion)
-                .findFirst()
-                .orElse(null);
-
-        FlowRule inPortVlanTableRule = createInPortVlanTable(inPortCriterion, vlanCriterion,
-                                                             filterObjective);
-        Collection<FlowRule> fwdClassifierRules = createFwdClassifierRules(inPortCriterion, ethDstCriterion,
-                                                                           ethDstMaskedCriterion, filterObjective);
-
-        resultBuilder.addFlowRule(inPortVlanTableRule);
-        fwdClassifierRules.forEach(resultBuilder::addFlowRule);
-        return resultBuilder.build();
-    }
-
-    private FlowRule createInPortVlanTable(Criterion inPortCriterion,
-                                           VlanIdCriterion vlanCriterion,
-                                           FilteringObjective filterObjective) {
-        Criterion vlanIsVlalidCriterion;
-        TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
-                .add(inPortCriterion);
-
-        VlanId vlanId = null;
-        if (vlanCriterion != null) {
-            vlanId = vlanCriterion.vlanId();
-        }
-
-        vlanIsVlalidCriterion = VLAN_VALID;
-        if (vlanId == null || vlanId.equals(VlanId.NONE)) {
-            // untag vlan, match in port only
-            vlanIsVlalidCriterion = VLAN_INVALID;
-        }
-
-        selector.add(vlanIsVlalidCriterion);
-
-        // TODO: check if this treatment is valid or not
-        TrafficTreatment treatment = filterObjective.meta();
-        if (treatment == null) {
-            treatment = DefaultTrafficTreatment.emptyTreatment();
-        }
-
-        return DefaultFlowRule.builder()
-                .fromApp(filterObjective.appId())
-                .withPriority(filterObjective.priority())
-                .withSelector(selector.build())
-                .withTreatment(treatment)
-                .withPriority(filterObjective.priority())
-                .forTable(FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN)
-                .forDevice(deviceId)
-                .makePermanent()
-                .build();
-    }
-
-    private Collection<FlowRule> createFwdClassifierRules(PortCriterion inPortCriterion,
-                                                          EthCriterion ethDstCriterion,
-                                                          EthCriterion ethDstMaskedCriterion,
-                                                          FilteringObjective filterObjective) {
-        PortNumber port = inPortCriterion.port();
-
-        Collection<FlowRule> flowRules = Lists.newArrayList();
-        if (ethDstCriterion == null) {
-            if (ethDstMaskedCriterion == null) {
-                // Bridging table, do nothing
-                return flowRules;
-            }
-            // Masked fwd classifier rule
-            MacAddress dstMac = ethDstMaskedCriterion.mac();
-            MacAddress dstMacMask = ethDstMaskedCriterion.mask();
-            FlowRule flow = createMaskedFwdClassifierRule(port, dstMac, dstMacMask, filterObjective);
-            if (flow != null) {
-                flowRules.add(flow);
-            }
-            return flowRules;
-        }
-        MacAddress dstMac = ethDstCriterion.mac();
-        flowRules.addAll(createIpFwdClassifierRules(port, dstMac, filterObjective));
-        flowRules.add(createMplsFwdClassifierRule(port, dstMac, filterObjective));
-        return flowRules;
-    }
-
-    private FlowRule createMaskedFwdClassifierRule(PortNumber inPort, MacAddress dstMac, MacAddress dstMacMask,
-                                                   FilteringObjective filterObjective) {
-        TrafficTreatment treatment;
-        short ethType;
-        if (dstMac.equals(MacAddress.IPV4_MULTICAST) && dstMacMask.equals(MacAddress.IPV4_MULTICAST_MASK)) {
-            treatment = createFwdClassifierTreatment(FWD_IPV4_ROUTING);
-            ethType = Ethernet.TYPE_IPV4;
-        } else if (dstMac.equals(MacAddress.IPV6_MULTICAST) && dstMacMask.equals(MacAddress.IPV6_MULTICAST_MASK)) {
-            treatment = createFwdClassifierTreatment(FWD_IPV6_ROUTING);
-            ethType = Ethernet.TYPE_IPV6;
-        } else {
-            log.warn("Unsupported masked fwd classifier rule. mac={}. mask={}", dstMac, dstMacMask);
-            return null;
-        }
-        return createFwdClassifierRule(inPort, ethType, dstMac, dstMacMask, treatment, filterObjective);
-    }
-
-    private Collection<FlowRule> createIpFwdClassifierRules(PortNumber inPort,
-                                                            MacAddress dstMac,
-                                                            FilteringObjective filterObjective) {
-        Collection<FlowRule> flowRules = Lists.newArrayList();
-        TrafficTreatment treatment;
-        treatment = createFwdClassifierTreatment(FWD_IPV4_ROUTING);
-        flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV4, dstMac, null, treatment, filterObjective));
-        treatment = createFwdClassifierTreatment(FWD_IPV6_ROUTING);
-        flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV6, dstMac, null, treatment, filterObjective));
-        return flowRules;
-    }
-
-    private FlowRule createMplsFwdClassifierRule(PortNumber inPort,
-                                                 MacAddress dstMac,
-                                                 FilteringObjective filterObjective) {
-        TrafficTreatment treatment = createFwdClassifierTreatment(FWD_MPLS);
-        return createFwdClassifierRule(inPort, Ethernet.MPLS_UNICAST, dstMac, null, treatment, filterObjective);
-    }
-
-    private FlowRule createFwdClassifierRule(PortNumber inPort,
-                                             short ethType,
-                                             MacAddress dstMac,
-                                             MacAddress dstMacMask,
-                                             TrafficTreatment treatment,
-                                             FilteringObjective filterObjective) {
-        TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
-                .matchInPort(inPort)
-                .matchEthType(ethType);
-        if (dstMacMask != null) {
-            selector.matchEthDstMasked(dstMac, dstMacMask);
-        } else {
-            selector.matchEthDstMasked(dstMac, MacAddress.EXACT_MASK);
-        }
-
-        return DefaultFlowRule.builder()
-                .withSelector(selector.build())
-                .withTreatment(treatment)
-                .fromApp(filterObjective.appId())
-                .withPriority(filterObjective.priority())
-                .forDevice(deviceId)
-                .makePermanent()
-                .forTable(FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER)
-                .build();
-    }
-
-    private TrafficTreatment createFwdClassifierTreatment(byte fwdType) {
-        PiActionParam param = new PiActionParam(FabricConstants.FWD_TYPE,
-                                                ImmutableByteSequence.copyFrom(fwdType));
-        PiAction action = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE)
-                .withParameter(param)
-                .build();
-        return DefaultTrafficTreatment.builder()
-                .piTableAction(action)
-                .build();
-
-    }
-}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
deleted file mode 100644
index a3d3926..0000000
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.pipelines.fabric.pipeliner;
-
-import com.google.common.collect.ImmutableSet;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flow.DefaultFlowRule;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.criteria.Criterion;
-import org.onosproject.net.flow.criteria.EthCriterion;
-import org.onosproject.net.flow.criteria.IPCriterion;
-import org.onosproject.net.flow.criteria.MplsCriterion;
-import org.onosproject.net.flow.criteria.VlanIdCriterion;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.net.pi.model.PiActionId;
-import org.onosproject.net.pi.runtime.PiAction;
-import org.onosproject.net.pi.runtime.PiActionParam;
-import org.onosproject.pipelines.fabric.FabricConstants;
-import org.slf4j.Logger;
-
-import java.util.Set;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Handling forwarding objective for fabric pipeliner.
- */
-public class FabricForwardingPipeliner {
-    private static final Logger log = getLogger(FabricForwardingPipeliner.class);
-
-    protected DeviceId deviceId;
-
-    public FabricForwardingPipeliner(DeviceId deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public PipelinerTranslationResult forward(ForwardingObjective forwardObjective) {
-        PipelinerTranslationResult.Builder resultBuilder = PipelinerTranslationResult.builder();
-        if (forwardObjective.flag() == ForwardingObjective.Flag.VERSATILE) {
-            processVersatileFwd(forwardObjective, resultBuilder);
-        } else {
-            processSpecificFwd(forwardObjective, resultBuilder);
-        }
-        return resultBuilder.build();
-    }
-
-    private void processVersatileFwd(ForwardingObjective fwd,
-                                     PipelinerTranslationResult.Builder resultBuilder) {
-        // TODO: Move IPv6 match to different ACL table
-
-        boolean unsupported = fwd.selector().criteria().stream()
-                .anyMatch(criterion -> criterion.type() == Criterion.Type.IPV6_DST);
-        unsupported |= fwd.selector().criteria().stream()
-                .anyMatch(criterion -> criterion.type() == Criterion.Type.IPV6_SRC);
-
-        if (unsupported) {
-            resultBuilder.setError(ObjectiveError.UNSUPPORTED);
-            return;
-        }
-
-        // program ACL table only
-        FlowRule flowRule = DefaultFlowRule.builder()
-                .withSelector(fwd.selector())
-                .withTreatment(fwd.treatment())
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)
-                .withPriority(fwd.priority())
-                .forDevice(deviceId)
-                .makePermanent()
-                .fromApp(fwd.appId())
-                .build();
-        resultBuilder.addFlowRule(flowRule);
-    }
-
-    private void processSpecificFwd(ForwardingObjective fwd,
-                                    PipelinerTranslationResult.Builder resultBuilder) {
-        TrafficSelector selector = fwd.selector();
-        TrafficSelector meta = fwd.meta();
-
-        ImmutableSet.Builder<Criterion> criterionSetBuilder = ImmutableSet.builder();
-        criterionSetBuilder.addAll(selector.criteria());
-
-        if (meta != null) {
-            criterionSetBuilder.addAll(meta.criteria());
-        }
-
-        Set<Criterion> criteria = criterionSetBuilder.build();
-
-        VlanIdCriterion vlanIdCriterion = null;
-        EthCriterion ethDstCriterion = null;
-        IPCriterion ipDstCriterion = null;
-        MplsCriterion mplsCriterion = null;
-
-        for (Criterion criterion : criteria) {
-            switch (criterion.type()) {
-                case ETH_DST:
-                    ethDstCriterion = (EthCriterion) criterion;
-                    break;
-                case VLAN_VID:
-                    vlanIdCriterion = (VlanIdCriterion) criterion;
-                    break;
-                case IPV4_DST:
-                    ipDstCriterion = (IPCriterion) criterion;
-                    break;
-                case MPLS_LABEL:
-                    mplsCriterion = (MplsCriterion) criterion;
-                    break;
-                case ETH_TYPE:
-                case MPLS_BOS:
-                    // do nothing
-                    break;
-                default:
-                    log.warn("Unsupported criterion {}", criterion);
-                    break;
-            }
-        }
-
-        ForwardingFunctionType forwardingFunctionType =
-                ForwardingFunctionType.getForwardingFunctionType(fwd);
-        switch (forwardingFunctionType) {
-            case L2_UNICAST:
-                processL2UnicastRule(vlanIdCriterion, ethDstCriterion, fwd, resultBuilder);
-                break;
-            case L2_BROADCAST:
-                processL2BroadcastRule(vlanIdCriterion, fwd, resultBuilder);
-                break;
-            case IPV4_ROUTING:
-                processIpv4RoutingRule(ipDstCriterion, fwd, resultBuilder);
-                break;
-            case MPLS:
-                processMplsRule(mplsCriterion, fwd, resultBuilder);
-                break;
-            case IPV6_ROUTING:
-            default:
-                log.warn("Unsupported forwarding function type {}", criteria);
-                resultBuilder.setError(ObjectiveError.UNSUPPORTED);
-                break;
-        }
-    }
-
-    // L2 Unicast: learnt mac address + vlan
-    private void processL2UnicastRule(VlanIdCriterion vlanIdCriterion,
-                                      EthCriterion ethDstCriterion,
-                                      ForwardingObjective fwd,
-                                      PipelinerTranslationResult.Builder resultBuilder) {
-        checkNotNull(vlanIdCriterion, "VlanId criterion should not be null");
-        checkNotNull(ethDstCriterion, "EthDst criterion should not be null");
-
-        VlanId vlanId = vlanIdCriterion.vlanId();
-        MacAddress ethDst = ethDstCriterion.mac();
-
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchVlanId(vlanId)
-                .matchEthDstMasked(ethDst, MacAddress.EXACT_MASK)
-                .build();
-        TrafficTreatment treatment = fwd.treatment();
-        if (fwd.nextId() != null) {
-            treatment = buildSetNextIdTreatment(fwd.nextId(),
-                                                FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
-        }
-
-        FlowRule flowRule = DefaultFlowRule.builder()
-                .withSelector(selector)
-                .withTreatment(treatment)
-                .fromApp(fwd.appId())
-                .withPriority(fwd.priority())
-                .makePermanent()
-                .forDevice(deviceId)
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING)
-                .build();
-
-        resultBuilder.addFlowRule(flowRule);
-    }
-
-    private void processL2BroadcastRule(VlanIdCriterion vlanIdCriterion,
-                                        ForwardingObjective fwd,
-                                        PipelinerTranslationResult.Builder resultBuilder) {
-        checkNotNull(vlanIdCriterion, "VlanId criterion should not be null");
-
-        VlanId vlanId = vlanIdCriterion.vlanId();
-
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchVlanId(vlanId)
-                .build();
-        TrafficTreatment treatment = fwd.treatment();
-        if (fwd.nextId() != null) {
-            treatment = buildSetNextIdTreatment(fwd.nextId(),
-                                                FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
-        }
-        FlowRule flowRule = DefaultFlowRule.builder()
-                .withSelector(selector)
-                .withTreatment(treatment)
-                .fromApp(fwd.appId())
-                .withPriority(fwd.priority())
-                .makePermanent()
-                .forDevice(deviceId)
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING)
-                .build();
-
-        resultBuilder.addFlowRule(flowRule);
-    }
-
-    private void processIpv4RoutingRule(IPCriterion ipDstCriterion, ForwardingObjective fwd,
-                                        PipelinerTranslationResult.Builder resultBuilder) {
-        checkNotNull(ipDstCriterion, "IP dst criterion should not be null");
-
-        if (ipDstCriterion.ip().prefixLength() == 0) {
-            setDefaultIpv4Route(fwd, resultBuilder);
-            return;
-        }
-
-        final TrafficSelector selector = DefaultTrafficSelector.builder()
-                    .matchIPDst(ipDstCriterion.ip())
-                    .build();
-
-        TrafficTreatment treatment = fwd.treatment();
-        if (fwd.nextId() != null) {
-            treatment = buildSetNextIdTreatment(
-                    fwd.nextId(),
-                    FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4);
-        }
-        FlowRule flowRule = DefaultFlowRule.builder()
-                .withSelector(selector)
-                .withTreatment(treatment)
-                .fromApp(fwd.appId())
-                .withPriority(fwd.priority())
-                .makePermanent()
-                .forDevice(deviceId)
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4)
-                .build();
-
-        resultBuilder.addFlowRule(flowRule);
-    }
-
-    private void setDefaultIpv4Route(ForwardingObjective fwd,
-                                     PipelinerTranslationResult.Builder resultBuilder) {
-        final TrafficSelector selector1 = DefaultTrafficSelector.builder()
-                .matchIPDst(IpPrefix.valueOf("0.0.0.0/1")).build();
-        final TrafficSelector selector2 = DefaultTrafficSelector.builder()
-                .matchIPDst(IpPrefix.valueOf("128.0.0.0/1")).build();
-
-        TrafficTreatment treatment = fwd.treatment();
-        if (fwd.nextId() != null) {
-            treatment = buildSetNextIdTreatment(
-                    fwd.nextId(),
-                    FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4);
-        }
-
-        for (TrafficSelector selector : new TrafficSelector[]{selector1, selector2}) {
-            FlowRule rule = DefaultFlowRule.builder()
-                    .withSelector(selector)
-                    .withTreatment(treatment)
-                    .fromApp(fwd.appId())
-                    .withPriority(0)
-                    .makePermanent()
-                    .forDevice(deviceId)
-                    .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4)
-                    .build();
-
-            resultBuilder.addFlowRule(rule);
-        }
-    }
-
-    private void processMplsRule(MplsCriterion mplsCriterion, ForwardingObjective fwd,
-                                 PipelinerTranslationResult.Builder resultBuilder) {
-        checkNotNull(mplsCriterion, "Mpls criterion should not be null");
-        TrafficTreatment treatment;
-
-        treatment = fwd.treatment();
-        if (fwd.nextId() != null) {
-            PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, fwd.nextId());
-            PiAction nextIdAction = PiAction.builder()
-                    .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT)
-                    .withParameter(nextIdParam)
-                    .build();
-            treatment = DefaultTrafficTreatment.builder()
-                    .piTableAction(nextIdAction)
-                    .build();
-        }
-
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .add(mplsCriterion)
-                .build();
-
-        FlowRule flowRule = DefaultFlowRule.builder()
-                .withSelector(selector)
-                .withTreatment(treatment)
-                .fromApp(fwd.appId())
-                .withPriority(fwd.priority())
-                .makePermanent()
-                .forDevice(deviceId)
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS)
-                .build();
-
-        resultBuilder.addFlowRule(flowRule);
-    }
-
-    /**
-     * Builds treatment with set_next_id action, returns empty treatment
-     * if next id is null.
-     *
-     * @param nextId the next id for action
-     * @return treatment with set_next_id action; empty treatment if next id is null
-     */
-    private static TrafficTreatment buildSetNextIdTreatment(Integer nextId, PiActionId actionId) {
-        PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, nextId);
-        PiAction nextIdAction = PiAction.builder()
-                .withId(actionId)
-                .withParameter(nextIdParam)
-                .build();
-
-        return DefaultTrafficTreatment.builder()
-                .piTableAction(nextIdAction)
-                .build();
-    }
-}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
deleted file mode 100644
index 479b1d4..0000000
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.pipelines.fabric.pipeliner;
-
-import org.onlab.packet.VlanId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.driver.Driver;
-import org.onosproject.net.flow.DefaultFlowRule;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.criteria.Criterion;
-import org.onosproject.net.flow.criteria.PiCriterion;
-import org.onosproject.net.flow.criteria.VlanIdCriterion;
-import org.onosproject.net.flow.instructions.Instruction;
-import org.onosproject.net.flow.instructions.L2ModificationInstruction;
-import org.onosproject.net.flowobjective.DefaultNextObjective;
-import org.onosproject.net.flowobjective.NextObjective;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.net.group.DefaultGroupBucket;
-import org.onosproject.net.group.DefaultGroupDescription;
-import org.onosproject.net.group.DefaultGroupKey;
-import org.onosproject.net.group.GroupBucket;
-import org.onosproject.net.group.GroupBuckets;
-import org.onosproject.net.group.GroupDescription;
-import org.onosproject.net.group.GroupKey;
-import org.onosproject.net.pi.runtime.PiAction;
-import org.onosproject.net.pi.runtime.PiActionGroupId;
-import org.onosproject.net.pi.runtime.PiActionParam;
-import org.onosproject.net.pi.runtime.PiGroupKey;
-import org.onosproject.pipelines.fabric.FabricConstants;
-import org.onosproject.pipelines.fabric.FabricUtils;
-import org.slf4j.Logger;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static org.onosproject.pipelines.fabric.FabricUtils.getOutputPort;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Handling next objective for fabric pipeliner.
- */
-public class FabricNextPipeliner {
-    private static final Logger log = getLogger(FabricNextPipeliner.class);
-    private static final String NO_HASHED_TABLE = "noHashedTable";
-
-    protected DeviceId deviceId;
-    protected Driver driver;
-
-    public FabricNextPipeliner(DeviceId deviceId, Driver driver) {
-        this.deviceId = deviceId;
-        this.driver = driver;
-    }
-
-    public PipelinerTranslationResult next(NextObjective nextObjective) {
-        PipelinerTranslationResult.Builder resultBuilder = PipelinerTranslationResult.builder();
-
-        if (nextObjective.op() != Objective.Operation.ADD_TO_EXISTING &&
-                nextObjective.op() != Objective.Operation.REMOVE_FROM_EXISTING) {
-            processNextVlanMeta(nextObjective, resultBuilder);
-        }
-
-        switch (nextObjective.type()) {
-            case SIMPLE:
-                processSimpleNext(nextObjective, resultBuilder);
-                break;
-            case HASHED:
-                processHashedNext(nextObjective, resultBuilder);
-                break;
-            case BROADCAST:
-                processBroadcastNext(nextObjective, resultBuilder);
-                break;
-            default:
-                log.warn("Unsupported next type {}", nextObjective);
-                resultBuilder.setError(ObjectiveError.UNSUPPORTED);
-                break;
-        }
-
-        return resultBuilder.build();
-    }
-
-    private void processNextVlanMeta(NextObjective next,
-                                     PipelinerTranslationResult.Builder resultBuilder) {
-        TrafficSelector meta = next.meta();
-        if (meta == null) {
-            // do nothing if there is no metadata in the next objective.
-            return;
-        }
-        VlanIdCriterion vlanIdCriterion =
-                (VlanIdCriterion) meta.getCriterion(Criterion.Type.VLAN_VID);
-
-        if (vlanIdCriterion == null) {
-            // do nothing if we can't find vlan from next objective metadata.
-            return;
-        }
-
-        VlanId vlanId = vlanIdCriterion.vlanId();
-        TrafficSelector selector = buildNextIdSelector(next.id());
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setVlanId(vlanId)
-                .build();
-
-        resultBuilder.addFlowRule(DefaultFlowRule.builder()
-                                          .withSelector(selector)
-                                          .withTreatment(treatment)
-                                          .forTable(FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META)
-                                          .makePermanent()
-                                          .withPriority(next.priority())
-                                          .forDevice(deviceId)
-                                          .fromApp(next.appId())
-                                          .build());
-    }
-
-    private void processSimpleNext(NextObjective next,
-                                   PipelinerTranslationResult.Builder resultBuilder) {
-
-        if (next.next().size() > 1) {
-            log.warn("Only one treatment in simple next objective");
-            resultBuilder.setError(ObjectiveError.BADPARAMS);
-            return;
-        }
-
-        TrafficSelector selector = buildNextIdSelector(next.id());
-        TrafficTreatment treatment = next.next().iterator().next();
-        PortNumber outputPort = getOutputPort(treatment);
-
-        if (outputPort == null) {
-            log.warn("At least one output instruction in simple next objective");
-            resultBuilder.setError(ObjectiveError.BADPARAMS);
-            return;
-        }
-
-        resultBuilder.addFlowRule(DefaultFlowRule.builder()
-                                          .withSelector(selector)
-                                          .withTreatment(treatment)
-                                          .forTable(FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)
-                                          .makePermanent()
-                                          .withPriority(next.priority())
-                                          .forDevice(deviceId)
-                                          .fromApp(next.appId())
-                                          .build());
-
-        if (includesPopVlanInst(treatment)) {
-            processVlanPopRule(outputPort, next, resultBuilder);
-        }
-    }
-
-    private boolean includesPopVlanInst(TrafficTreatment treatment) {
-        return treatment.allInstructions()
-                .stream()
-                .filter(inst -> inst.type() == Instruction.Type.L2MODIFICATION)
-                .map(inst -> (L2ModificationInstruction) inst)
-                .anyMatch(inst -> inst.subtype() == L2ModificationInstruction.L2SubType.VLAN_POP);
-    }
-
-    private void processVlanPopRule(PortNumber port, NextObjective next,
-                                    PipelinerTranslationResult.Builder resultBuilder) {
-        TrafficSelector meta = next.meta();
-        VlanIdCriterion vlanIdCriterion =
-                (VlanIdCriterion) meta.getCriterion(Criterion.Type.VLAN_VID);
-        VlanId vlanId = vlanIdCriterion.vlanId();
-
-        PiCriterion egressVlanTableMatch = PiCriterion.builder()
-                .matchExact(FabricConstants.STANDARD_METADATA_EGRESS_PORT,
-                            (short) port.toLong())
-                .build();
-        // Add VLAN pop rule to egress pipeline table
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchPi(egressVlanTableMatch)
-                .matchVlanId(vlanId)
-                .build();
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .popVlan()
-                .build();
-        resultBuilder.addFlowRule(DefaultFlowRule.builder()
-                                          .withSelector(selector)
-                                          .withTreatment(treatment)
-                                          .forTable(FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN)
-                                          .makePermanent()
-                                          .withPriority(next.priority())
-                                          .forDevice(deviceId)
-                                          .fromApp(next.appId())
-                                          .build());
-    }
-
-    private void processHashedNext(NextObjective next, PipelinerTranslationResult.Builder resultBuilder) {
-        boolean noHashedTable = Boolean.parseBoolean(driver.getProperty(NO_HASHED_TABLE));
-
-        if (noHashedTable) {
-            if (next.next().isEmpty()) {
-                return;
-            }
-            // use first action if not support hashed group
-            TrafficTreatment treatment = next.next().iterator().next();
-
-            NextObjective.Builder simpleNext = DefaultNextObjective.builder()
-                    .addTreatment(treatment)
-                    .withId(next.id())
-                    .fromApp(next.appId())
-                    .makePermanent()
-                    .withMeta(next.meta())
-                    .withPriority(next.priority())
-                    .withType(NextObjective.Type.SIMPLE);
-
-            if (next.context().isPresent()) {
-                processSimpleNext(simpleNext.add(next.context().get()), resultBuilder);
-            } else {
-                processSimpleNext(simpleNext.add(), resultBuilder);
-            }
-            return;
-        }
-
-        // create hash groups
-        int groupId = next.id();
-        List<GroupBucket> bucketList = next.next().stream()
-                .map(DefaultGroupBucket::createSelectGroupBucket)
-                .collect(Collectors.toList());
-
-        // Egress VLAN handling
-        next.next().forEach(treatment -> {
-            PortNumber outputPort = getOutputPort(treatment);
-            if (includesPopVlanInst(treatment) && outputPort != null) {
-                processVlanPopRule(outputPort, next, resultBuilder);
-            }
-        });
-
-        if (bucketList.size() != next.next().size()) {
-            // some action not converted
-            // set error
-            log.warn("Expected bucket size {}, got {}", next.next().size(), bucketList.size());
-            resultBuilder.setError(ObjectiveError.BADPARAMS);
-            return;
-        }
-
-        GroupBuckets buckets = new GroupBuckets(bucketList);
-        PiGroupKey groupKey = new PiGroupKey(FabricConstants.FABRIC_INGRESS_NEXT_HASHED,
-                                             FabricConstants.FABRIC_INGRESS_NEXT_ECMP_SELECTOR,
-                                             groupId);
-
-        resultBuilder.addGroup(new DefaultGroupDescription(deviceId,
-                                                           GroupDescription.Type.SELECT,
-                                                           buckets,
-                                                           groupKey,
-                                                           groupId,
-                                                           next.appId()));
-
-        // flow
-        // If operation is ADD_TO_EXIST or REMOVE_FROM_EXIST, means we modify
-        // group buckets only, no changes for flow rule
-        if (next.op() == Objective.Operation.ADD_TO_EXISTING ||
-                next.op() == Objective.Operation.REMOVE_FROM_EXISTING) {
-            return;
-        }
-        TrafficSelector selector = buildNextIdSelector(next.id());
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .piTableAction(PiActionGroupId.of(next.id()))
-                .build();
-
-        resultBuilder.addFlowRule(DefaultFlowRule.builder()
-                                          .withSelector(selector)
-                                          .withTreatment(treatment)
-                                          .forTable(FabricConstants.FABRIC_INGRESS_NEXT_HASHED)
-                                          .makePermanent()
-                                          .withPriority(next.priority())
-                                          .forDevice(deviceId)
-                                          .fromApp(next.appId())
-                                          .build());
-    }
-
-    private TrafficSelector buildNextIdSelector(int nextId) {
-        PiCriterion nextIdCriterion = PiCriterion.builder()
-                .matchExact(FabricConstants.FABRIC_METADATA_NEXT_ID, nextId)
-                .build();
-        return DefaultTrafficSelector.builder()
-                .matchPi(nextIdCriterion)
-                .build();
-    }
-
-    private void processBroadcastNext(NextObjective next, PipelinerTranslationResult.Builder resultBuilder) {
-        final GroupDescription allGroup = getAllGroup(next);
-        if (allGroup == null) {
-            // Error already logged.
-            resultBuilder.setError(ObjectiveError.BADPARAMS);
-            return;
-        }
-
-        resultBuilder.addGroup(allGroup);
-        //flow rule
-        final TrafficSelector selector = buildNextIdSelector(next.id());
-        final PiActionParam groupIdParam = new PiActionParam(
-                FabricConstants.GID, allGroup.givenGroupId());
-
-        final PiAction setMcGroupAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_MCAST_GROUP)
-                .withParameter(groupIdParam)
-                .build();
-        final TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .piTableAction(setMcGroupAction)
-                .build();
-
-        resultBuilder.addFlowRule(
-                DefaultFlowRule.builder()
-                        .withSelector(selector)
-                        .withTreatment(treatment)
-                        .forTable(FabricConstants.FABRIC_INGRESS_NEXT_MULTICAST)
-                        .makePermanent()
-                        .withPriority(next.priority())
-                        .forDevice(deviceId)
-                        .fromApp(next.appId())
-                        .build());
-
-        // Egress VLAN handling
-        next.next().forEach(t -> {
-            PortNumber outputPort = getOutputPort(t);
-            if (includesPopVlanInst(t) && outputPort != null) {
-                processVlanPopRule(outputPort, next, resultBuilder);
-            }
-            if (t.allInstructions().size() > 2) {
-                // More than OUTPUT and VLAN_POP...
-                log.warn("Some instructions of BROADCAST NextObjective might" +
-                                 "not have been applied, supported only " +
-                                 "OUTPUT and VLAN_POP, but found {}", t);
-            }
-        });
-    }
-
-    private GroupDescription getAllGroup(NextObjective next) {
-        final List<GroupBucket> bucketList = next.next().stream()
-                .map(FabricUtils::getOutputInstruction)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .map(i -> DefaultTrafficTreatment.builder().add(i).build())
-                .map(DefaultGroupBucket::createAllGroupBucket)
-                .collect(Collectors.toList());
-
-        if (bucketList.size() != next.next().size()) {
-            log.warn("Got BROADCAST NextObjective with {} treatments but " +
-                             "found only {} OUTPUT instructions, cannot " +
-                             "translate to ALL groups",
-                     next.next().size(), bucketList.size());
-            return null;
-        }
-
-        // FIXME: remove once support for clone sessions is available
-        // Right now we add a CPU port to all multicast groups. The egress
-        // pipeline is expected to drop replicated packets to the CPU if a clone
-        // was  not requested in the ingress pipeline.
-        bucketList.add(
-                DefaultGroupBucket.createAllGroupBucket(
-                        DefaultTrafficTreatment.builder()
-                                .setOutput(PortNumber.CONTROLLER)
-                                .build()));
-
-        final int groupId = next.id();
-        final GroupBuckets buckets = new GroupBuckets(bucketList);
-        // Used DefaultGroupKey instead of PiGroupKey
-        // as we don't have any action profile to apply to the groups of ALL type
-        final GroupKey groupKey = new DefaultGroupKey(FabricPipeliner.KRYO.serialize(groupId));
-
-        return new DefaultGroupDescription(deviceId,
-                                           GroupDescription.Type.ALL,
-                                           buckets,
-                                           groupKey,
-                                           groupId,
-                                           next.appId());
-    }
-}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipeliner.java
index 7b3006d..4bf1bb5 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipeliner.java
@@ -16,56 +16,50 @@
 
 package org.onosproject.pipelines.fabric.pipeliner;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.onlab.util.KryoNamespace;
-import org.onlab.util.Tools;
-import org.onosproject.core.GroupId;
+import org.onlab.util.SharedExecutors;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.behaviour.NextGroup;
 import org.onosproject.net.behaviour.Pipeliner;
 import org.onosproject.net.behaviour.PipelinerContext;
-import org.onosproject.net.driver.AbstractHandlerBehaviour;
-import org.onosproject.net.driver.Driver;
-import org.onosproject.net.flow.FlowId;
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.FlowRuleOperations;
 import org.onosproject.net.flow.FlowRuleService;
-import org.onosproject.net.flow.instructions.Instruction;
-import org.onosproject.net.flow.instructions.Instructions;
 import org.onosproject.net.flowobjective.FilteringObjective;
 import org.onosproject.net.flowobjective.FlowObjectiveStore;
 import org.onosproject.net.flowobjective.ForwardingObjective;
+import org.onosproject.net.flowobjective.IdNextTreatment;
 import org.onosproject.net.flowobjective.NextObjective;
+import org.onosproject.net.flowobjective.NextTreatment;
 import org.onosproject.net.flowobjective.Objective;
 import org.onosproject.net.flowobjective.ObjectiveError;
 import org.onosproject.net.group.GroupDescription;
-import org.onosproject.net.group.GroupEvent;
 import org.onosproject.net.group.GroupService;
+import org.onosproject.pipelines.fabric.AbstractFabricHandlerBehavior;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.slf4j.Logger;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import static java.lang.String.format;
+import static org.onosproject.pipelines.fabric.FabricUtils.outputPort;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
- * Pipeliner for fabric pipeline.
+ * Pipeliner implementation for fabric pipeline which uses ObjectiveTranslator
+ * implementations to translate flow objectives for the different blocks,
+ * filtering, forwarding and next.
  */
-public class FabricPipeliner  extends AbstractHandlerBehaviour implements Pipeliner {
+public class FabricPipeliner extends AbstractFabricHandlerBehavior
+        implements Pipeliner {
+
     private static final Logger log = getLogger(FabricPipeliner.class);
 
     protected static final KryoNamespace KRYO = new KryoNamespace.Builder()
@@ -73,270 +67,213 @@
             .register(FabricNextGroup.class)
             .build("FabricPipeliner");
 
-    private static final int NUM_CALLBACK_THREAD = 2;
-
     protected DeviceId deviceId;
     protected FlowRuleService flowRuleService;
     protected GroupService groupService;
     protected FlowObjectiveStore flowObjectiveStore;
-    FabricFilteringPipeliner pipelinerFilter;
-    FabricForwardingPipeliner pipelinerForward;
-    FabricNextPipeliner pipelinerNext;
 
-    private Map<PendingFlowKey, PendingInstallObjective> pendingInstallObjectiveFlows = new ConcurrentHashMap<>();
-    private Map<PendingGroupKey, PendingInstallObjective> pendingInstallObjectiveGroups = new ConcurrentHashMap<>();
-    private Map<Objective, PendingInstallObjective> pendingInstallObjectives = Maps.newConcurrentMap();
+    private FilteringObjectiveTranslator filteringTranslator;
+    private ForwardingObjectiveTranslator forwardingTranslator;
+    private NextObjectiveTranslator nextTranslator;
 
-    private static ExecutorService flowObjCallbackExecutor =
-            Executors.newFixedThreadPool(NUM_CALLBACK_THREAD, Tools.groupedThreads("fabric-pipeliner", "cb-", log));
-
+    private final ExecutorService callbackExecutor = SharedExecutors.getPoolThreadExecutor();
 
     @Override
     public void init(DeviceId deviceId, PipelinerContext context) {
-        Driver driver = handler().driver();
         this.deviceId = deviceId;
         this.flowRuleService = context.directory().get(FlowRuleService.class);
         this.groupService = context.directory().get(GroupService.class);
         this.flowObjectiveStore = context.directory().get(FlowObjectiveStore.class);
-        this.pipelinerFilter = new FabricFilteringPipeliner(deviceId);
-        this.pipelinerForward = new FabricForwardingPipeliner(deviceId);
-        this.pipelinerNext = new FabricNextPipeliner(deviceId, driver);
+        this.filteringTranslator = new FilteringObjectiveTranslator(deviceId, capabilities);
+        this.forwardingTranslator = new ForwardingObjectiveTranslator(deviceId, capabilities);
+        this.nextTranslator = new NextObjectiveTranslator(deviceId, capabilities);
     }
 
     @Override
-    public void filter(FilteringObjective filterObjective) {
-        PipelinerTranslationResult result = pipelinerFilter.filter(filterObjective);
-        if (result.error().isPresent()) {
-            fail(filterObjective, result.error().get());
-            return;
-        }
-
-        applyTranslationResult(filterObjective, result, error -> {
-            if (error == null) {
-                success(filterObjective);
-            } else {
-                log.info("Ignore error {}. Let flow subsystem retry", error);
-                success(filterObjective);
-            }
-        });
+    public void filter(FilteringObjective obj) {
+        final ObjectiveTranslation result = filteringTranslator.translate(obj);
+        handleResult(obj, result);
     }
 
     @Override
-    public void forward(ForwardingObjective forwardObjective) {
-        PipelinerTranslationResult result = pipelinerForward.forward(forwardObjective);
-        if (result.error().isPresent()) {
-            fail(forwardObjective, result.error().get());
-            return;
-        }
-
-        applyTranslationResult(forwardObjective, result, error -> {
-            if (error == null) {
-                success(forwardObjective);
-            } else {
-                log.info("Ignore error {}. Let flow subsystem retry", error);
-                success(forwardObjective);
-            }
-        });
+    public void forward(ForwardingObjective obj) {
+        final ObjectiveTranslation result = forwardingTranslator.translate(obj);
+        handleResult(obj, result);
     }
 
     @Override
-    public void next(NextObjective nextObjective) {
-        PipelinerTranslationResult result = pipelinerNext.next(nextObjective);
-
-        if (result.error().isPresent()) {
-            fail(nextObjective, result.error().get());
-            return;
-        }
-
-        if (nextObjective.op() == Objective.Operation.VERIFY) {
+    public void next(NextObjective obj) {
+        if (obj.op() == Objective.Operation.VERIFY) {
             // TODO: support VERIFY operation
-            log.debug("Currently we don't support VERIFY operation, return success directly to the context");
-            success(nextObjective);
+            log.debug("VERIFY operation not yet supported for NextObjective, will return success");
+            success(obj);
             return;
         }
 
-        if (nextObjective.op() == Objective.Operation.MODIFY) {
+        if (obj.op() == Objective.Operation.MODIFY) {
             // TODO: support MODIFY operation
-            log.debug("Currently we don't support MODIFY operation, return failure directly to the context");
-            fail(nextObjective, ObjectiveError.UNSUPPORTED);
+            log.warn("MODIFY operation not yet supported for NextObjective, will return failure :(");
+            fail(obj, ObjectiveError.UNSUPPORTED);
             return;
         }
 
-        applyTranslationResult(nextObjective, result, error -> {
-            if (error != null) {
-                log.info("Ignore error {}. Let flow/group subsystem retry", error);
-                success(nextObjective);
-                return;
-            }
-
-            if (nextObjective.op() == Objective.Operation.REMOVE) {
-                if (flowObjectiveStore.getNextGroup(nextObjective.id()) == null) {
-                    log.warn("Can not find next obj {} from store", nextObjective.id());
-                    return;
-                }
-                flowObjectiveStore.removeNextGroup(nextObjective.id());
-            } else {
-                // Success, put next group to objective store
-                List<PortNumber> portNumbers = Lists.newArrayList();
-                nextObjective.next().forEach(treatment ->
-                        treatment.allInstructions()
-                                .stream()
-                                .filter(inst -> inst.type() == Instruction.Type.OUTPUT)
-                                .map(inst -> (Instructions.OutputInstruction) inst)
-                                .findFirst()
-                                .map(Instructions.OutputInstruction::port)
-                                .ifPresent(portNumbers::add)
-                );
-                FabricNextGroup nextGroup = new FabricNextGroup(nextObjective.type(),
-                                                                portNumbers);
-                flowObjectiveStore.putNextGroup(nextObjective.id(), nextGroup);
-            }
-
-            success(nextObjective);
-        });
+        final ObjectiveTranslation result = nextTranslator.translate(obj);
+        handleResult(obj, result);
     }
 
     @Override
     public List<String> getNextMappings(NextGroup nextGroup) {
-        FabricNextGroup fabricNextGroup = KRYO.deserialize(nextGroup.data());
-        NextObjective.Type type = fabricNextGroup.type();
-        Collection<PortNumber> outputPorts = fabricNextGroup.outputPorts();
-
-        return outputPorts.stream()
-                .map(port -> String.format("%s -> %s", type, port))
+        final FabricNextGroup fabricNextGroup = KRYO.deserialize(nextGroup.data());
+        return fabricNextGroup.nextMappings().stream()
+                .map(m -> format("%s -> %s", fabricNextGroup.type(), m))
                 .collect(Collectors.toList());
     }
 
-    private void applyTranslationResult(Objective objective,
-                                        PipelinerTranslationResult result,
-                                        Consumer<ObjectiveError> callback) {
-        Collection<GroupDescription> groups = result.groups();
-        Collection<FlowRule> flowRules = result.flowRules();
-
-        Set<FlowId> flowIds = flowRules.stream().map(FlowRule::id).collect(Collectors.toSet());
-        Set<PendingGroupKey> pendingGroupKeys = groups.stream().map(GroupDescription::givenGroupId)
-                .map(GroupId::new)
-                .map(gid -> new PendingGroupKey(gid, objective.op()))
-                .collect(Collectors.toSet());
-
-        PendingInstallObjective pio =
-                new PendingInstallObjective(objective, flowIds, pendingGroupKeys, callback);
-
-        flowIds.forEach(flowId -> {
-            PendingFlowKey pfk = new PendingFlowKey(flowId, objective.id());
-            pendingInstallObjectiveFlows.put(pfk, pio);
-        });
-
-        pendingGroupKeys.forEach(pendingGroupKey ->
-            pendingInstallObjectiveGroups.put(pendingGroupKey, pio)
-        );
-
-        pendingInstallObjectives.put(objective, pio);
-        installGroups(objective, groups);
-        installFlows(objective, flowRules);
+    private void handleResult(Objective obj, ObjectiveTranslation result) {
+        if (result.error().isPresent()) {
+            fail(obj, result.error().get());
+            return;
+        }
+        processGroups(obj, result.groups());
+        processFlows(obj, result.flowRules());
+        if (obj instanceof NextObjective) {
+            handleNextGroup((NextObjective) obj);
+        }
+        success(obj);
     }
 
-    private void installFlows(Objective objective, Collection<FlowRule> flowRules) {
+    private void handleNextGroup(NextObjective obj) {
+        switch (obj.op()) {
+            case REMOVE:
+                removeNextGroup(obj);
+                break;
+            case ADD:
+            case ADD_TO_EXISTING:
+            case REMOVE_FROM_EXISTING:
+            case MODIFY:
+                putNextGroup(obj);
+                break;
+            case VERIFY:
+                break;
+            default:
+                log.error("Unknown NextObjective operation '{}'", obj.op());
+        }
+    }
+
+    private void processFlows(Objective objective, Collection<FlowRule> flowRules) {
         if (flowRules.isEmpty()) {
             return;
         }
-
-        FlowRuleOperations ops = buildFlowRuleOps(objective, flowRules);
-        if (ops == null) {
-            return;
+        final FlowRuleOperations.Builder ops = FlowRuleOperations.builder();
+        switch (objective.op()) {
+            case ADD:
+            case ADD_TO_EXISTING:
+                flowRules.forEach(ops::add);
+                break;
+            case REMOVE:
+            case REMOVE_FROM_EXISTING:
+                flowRules.forEach(ops::remove);
+                break;
+            default:
+                log.warn("Unsupported Objective operation '{}'", objective.op());
+                return;
         }
-        flowRuleService.apply(ops);
-
-        flowRules.forEach(flow -> {
-            PendingFlowKey pfk = new PendingFlowKey(flow.id(), objective.id());
-            PendingInstallObjective pio = pendingInstallObjectiveFlows.remove(pfk);
-
-            if (pio != null) {
-                pio.flowInstalled(flow.id());
-            }
-        });
+        flowRuleService.apply(ops.build());
     }
 
-    private void installGroups(Objective objective, Collection<GroupDescription> groups) {
+    private void processGroups(Objective objective, Collection<GroupDescription> groups) {
         if (groups.isEmpty()) {
             return;
         }
-
         switch (objective.op()) {
             case ADD:
                 groups.forEach(groupService::addGroup);
                 break;
             case REMOVE:
-                groups.forEach(group -> groupService.removeGroup(deviceId, group.appCookie(), objective.appId()));
+                groups.forEach(group -> groupService.removeGroup(
+                        deviceId, group.appCookie(), objective.appId()));
                 break;
             case ADD_TO_EXISTING:
-                groups.forEach(group -> groupService.addBucketsToGroup(deviceId, group.appCookie(),
-                        group.buckets(), group.appCookie(), group.appId())
+                groups.forEach(group -> groupService.addBucketsToGroup(
+                        deviceId, group.appCookie(), group.buckets(),
+                        group.appCookie(), group.appId())
                 );
                 break;
             case REMOVE_FROM_EXISTING:
-                groups.forEach(group -> groupService.removeBucketsFromGroup(deviceId, group.appCookie(),
-                        group.buckets(), group.appCookie(), group.appId())
+                groups.forEach(group -> groupService.removeBucketsFromGroup(
+                        deviceId, group.appCookie(), group.buckets(),
+                        group.appCookie(), group.appId())
                 );
                 break;
             default:
-                log.warn("Unsupported objective operation {}", objective.op());
-                return;
+                log.warn("Unsupported Objective operation {}", objective.op());
         }
+    }
 
-        groups.forEach(group -> {
-            PendingGroupKey pendingGroupKey = new PendingGroupKey(new GroupId(group.givenGroupId()), objective.op());
-            PendingInstallObjective pio = pendingInstallObjectiveGroups.remove(pendingGroupKey);
-            pio.groupInstalled(pendingGroupKey);
-        });
+    private void fail(Objective objective, ObjectiveError error) {
+        CompletableFuture.runAsync(
+                () -> objective.context().ifPresent(
+                        ctx -> ctx.onError(objective, error)), callbackExecutor);
 
     }
 
-    private static void fail(Objective objective, ObjectiveError error) {
-        CompletableFuture.runAsync(() -> objective.context().ifPresent(ctx -> ctx.onError(objective, error)),
-                flowObjCallbackExecutor);
 
+    private void success(Objective objective) {
+        CompletableFuture.runAsync(
+                () -> objective.context().ifPresent(
+                        ctx -> ctx.onSuccess(objective)), callbackExecutor);
     }
 
-    private static void success(Objective objective) {
-        CompletableFuture.runAsync(() -> objective.context().ifPresent(ctx -> ctx.onSuccess(objective)),
-                flowObjCallbackExecutor);
+    private void removeNextGroup(NextObjective obj) {
+        final NextGroup removed = flowObjectiveStore.removeNextGroup(obj.id());
+        if (removed == null) {
+            log.debug("NextGroup {} was not found in FlowObjectiveStore");
+        }
     }
 
-    private static FlowRuleOperations buildFlowRuleOps(Objective objective, Collection<FlowRule> flowRules) {
-        FlowRuleOperations.Builder ops = FlowRuleOperations.builder();
-        switch (objective.op()) {
-            case ADD:
-            case ADD_TO_EXISTING: // For egress VLAN
-                flowRules.forEach(ops::add);
-                break;
-            case REMOVE:
-            case REMOVE_FROM_EXISTING: // For egress VLAN
-                flowRules.forEach(ops::remove);
-                break;
+    private void putNextGroup(NextObjective obj) {
+        final List<String> nextMappings = obj.nextTreatments().stream()
+                .map(this::nextTreatmentToMappingString)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        final FabricNextGroup nextGroup = new FabricNextGroup(obj.type(), nextMappings);
+        flowObjectiveStore.putNextGroup(obj.id(), nextGroup);
+    }
+
+    private String nextTreatmentToMappingString(NextTreatment n) {
+        switch (n.type()) {
+            case TREATMENT:
+                final PortNumber p = outputPort(n);
+                return p == null ? "UNKNOWN"
+                        : format("OUTPUT:%s", p.toString());
+            case ID:
+                final IdNextTreatment id = (IdNextTreatment) n;
+                return format("NEXT_ID:%d", id.nextId());
             default:
-                log.warn("Unsupported op {} for {}", objective.op(), objective);
-                fail(objective, ObjectiveError.BADPARAMS);
-                return null;
+                log.warn("Unknown NextTreatment type '{}'", n.type());
+                return "???";
         }
-        return ops.build();
     }
 
-    class FabricNextGroup implements NextGroup {
-        private NextObjective.Type type;
-        private Collection<PortNumber> outputPorts;
+    /**
+     * NextGroup implementation.
+     */
+    private static class FabricNextGroup implements NextGroup {
 
-        FabricNextGroup(NextObjective.Type type, Collection<PortNumber> outputPorts) {
+        private final NextObjective.Type type;
+        private final List<String> nextMappings;
+
+        FabricNextGroup(NextObjective.Type type, List<String> nextMappings) {
             this.type = type;
-            this.outputPorts = ImmutableList.copyOf(outputPorts);
+            this.nextMappings = ImmutableList.copyOf(nextMappings);
         }
 
         NextObjective.Type type() {
             return type;
         }
 
-        Collection<PortNumber> outputPorts() {
-            return outputPorts;
+        Collection<String> nextMappings() {
+            return nextMappings;
         }
 
         @Override
@@ -344,168 +281,4 @@
             return KRYO.serialize(this);
         }
     }
-
-    class PendingInstallObjective {
-        Objective objective;
-        Collection<FlowId> flowIds;
-        Collection<PendingGroupKey> pendingGroupKeys;
-        Consumer<ObjectiveError> callback;
-
-        PendingInstallObjective(Objective objective, Collection<FlowId> flowIds,
-                                       Collection<PendingGroupKey> pendingGroupKeys,
-                                       Consumer<ObjectiveError> callback) {
-            this.objective = objective;
-            this.flowIds = flowIds;
-            this.pendingGroupKeys = pendingGroupKeys;
-            this.callback = callback;
-        }
-
-        void flowInstalled(FlowId flowId) {
-            synchronized (this) {
-                flowIds.remove(flowId);
-                checkIfFinished();
-            }
-        }
-
-        void groupInstalled(PendingGroupKey pendingGroupKey) {
-            synchronized (this) {
-                pendingGroupKeys.remove(pendingGroupKey);
-                checkIfFinished();
-            }
-        }
-
-        private void checkIfFinished() {
-            if (flowIds.isEmpty() && pendingGroupKeys.isEmpty()) {
-                pendingInstallObjectives.remove(objective);
-                callback.accept(null);
-            }
-        }
-
-        void failed(Objective obj, ObjectiveError error) {
-            flowIds.forEach(flowId -> {
-                PendingFlowKey pfk = new PendingFlowKey(flowId, obj.id());
-                pendingInstallObjectiveFlows.remove(pfk);
-            });
-            pendingGroupKeys.forEach(pendingInstallObjectiveGroups::remove);
-            pendingInstallObjectives.remove(objective);
-            callback.accept(error);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            PendingInstallObjective pio = (PendingInstallObjective) o;
-            return Objects.equal(objective, pio.objective) &&
-                    Objects.equal(flowIds, pio.flowIds) &&
-                    Objects.equal(pendingGroupKeys, pio.pendingGroupKeys) &&
-                    Objects.equal(callback, pio.callback);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(objective, flowIds, pendingGroupKeys, callback);
-        }
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("obj", objective)
-                    .add("flowIds", flowIds)
-                    .add("pendingGroupKeys", pendingGroupKeys)
-                    .add("callback", callback)
-                    .toString();
-        }
-    }
-
-    class PendingFlowKey {
-        private FlowId flowId;
-        private int objId;
-
-        PendingFlowKey(FlowId flowId, int objId) {
-            this.flowId = flowId;
-            this.objId = objId;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            PendingFlowKey pendingFlowKey = (PendingFlowKey) o;
-            return Objects.equal(flowId, pendingFlowKey.flowId) &&
-                    objId == pendingFlowKey.objId;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(flowId, objId);
-        }
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("flowId", flowId)
-                    .add("objId", objId)
-                    .toString();
-        }
-    }
-
-    class PendingGroupKey {
-        private GroupId groupId;
-        private GroupEvent.Type expectedEventType;
-
-        PendingGroupKey(GroupId groupId, NextObjective.Operation objOp) {
-            this.groupId = groupId;
-
-            switch (objOp) {
-                case ADD:
-                    expectedEventType = GroupEvent.Type.GROUP_ADDED;
-                    break;
-                case REMOVE:
-                    expectedEventType = GroupEvent.Type.GROUP_REMOVED;
-                    break;
-                case MODIFY:
-                case ADD_TO_EXISTING:
-                case REMOVE_FROM_EXISTING:
-                    expectedEventType = GroupEvent.Type.GROUP_UPDATED;
-                    break;
-                default:
-                    expectedEventType = null;
-            }
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            PendingGroupKey pendingGroupKey = (PendingGroupKey) o;
-            return Objects.equal(groupId, pendingGroupKey.groupId) &&
-                    expectedEventType == pendingGroupKey.expectedEventType;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(groupId, expectedEventType);
-        }
-
-        @Override
-        public String toString() {
-            return MoreObjects.toStringHelper(this)
-                    .add("groupId", groupId)
-                    .add("expectedEventType", expectedEventType)
-                    .toString();
-        }
-    }
 }
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerException.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerException.java
new file mode 100644
index 0000000..7f6d71e
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerException.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.pipeliner;
+
+import org.onosproject.net.flowobjective.ObjectiveError;
+
+/**
+ * Signals an exception when translating a flow objective.
+ */
+class FabricPipelinerException extends Exception {
+
+    private final ObjectiveError error;
+
+    /**
+     * Creates a new exception for the given message. Sets ObjectiveError to
+     * UNSUPPORTED.
+     *
+     * @param message message
+     */
+    FabricPipelinerException(String message) {
+        super(message);
+        this.error = ObjectiveError.UNSUPPORTED;
+    }
+
+    /**
+     * Creates a new exception for the given message and ObjectiveError.
+     *
+     * @param message message
+     * @param error objective error
+     */
+    FabricPipelinerException(String message, ObjectiveError error) {
+        super(message);
+        this.error = error;
+    }
+
+    /**
+     * Returns the ObjectiveError of this exception.
+     *
+     * @return objective error
+     */
+    ObjectiveError objectiveError() {
+        return error;
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FilteringObjectiveTranslator.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FilteringObjectiveTranslator.java
new file mode 100644
index 0000000..67d7b3a
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FilteringObjectiveTranslator.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.pipeliner;
+
+import com.google.common.collect.Lists;
+import org.onlab.packet.Ethernet;
+import org.onlab.packet.MacAddress;
+import org.onlab.packet.VlanId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.criteria.EthCriterion;
+import org.onosproject.net.flow.criteria.PiCriterion;
+import org.onosproject.net.flow.criteria.PortCriterion;
+import org.onosproject.net.flow.criteria.VlanIdCriterion;
+import org.onosproject.net.flowobjective.FilteringObjective;
+import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.pi.runtime.PiAction;
+import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.pipelines.fabric.FabricCapabilities;
+import org.onosproject.pipelines.fabric.FabricConstants;
+
+import java.util.Collection;
+import java.util.List;
+
+import static java.lang.String.format;
+import static org.onosproject.pipelines.fabric.FabricUtils.criterion;
+
+/**
+ * ObjectiveTranslator implementation for FilteringObjective.
+ */
+class FilteringObjectiveTranslator
+        extends AbstractObjectiveTranslator<FilteringObjective> {
+
+    // Forwarding types from fabric.p4.
+    static final byte FWD_MPLS = 1;
+    static final byte FWD_IPV4_ROUTING = 2;
+    static final byte FWD_IPV6_ROUTING = 3;
+
+    private static final byte[] ONE = new byte[]{1};
+    private static final byte[] ZERO = new byte[]{0};
+
+    private static final PiAction DENY = PiAction.builder()
+            .withId(FabricConstants.FABRIC_INGRESS_FILTERING_DENY)
+            .build();
+
+    private static final PiCriterion VLAN_VALID = PiCriterion.builder()
+            .matchExact(FabricConstants.HDR_VLAN_IS_VALID, ONE)
+            .build();
+    private static final PiCriterion VLAN_INVALID = PiCriterion.builder()
+            .matchExact(FabricConstants.HDR_VLAN_IS_VALID, ZERO)
+            .build();
+
+    FilteringObjectiveTranslator(DeviceId deviceId, FabricCapabilities capabilities) {
+        super(deviceId, capabilities);
+    }
+
+    @Override
+    public ObjectiveTranslation doTranslate(FilteringObjective obj)
+            throws FabricPipelinerException {
+
+        final ObjectiveTranslation.Builder resultBuilder =
+                ObjectiveTranslation.builder();
+
+        if (obj.key() == null || obj.key().type() != Criterion.Type.IN_PORT) {
+            throw new FabricPipelinerException(
+                    format("Unsupported or missing filtering key: key=%s", obj.key()),
+                    ObjectiveError.BADPARAMS);
+        }
+
+        final PortCriterion inPort = (PortCriterion) obj.key();
+        final VlanIdCriterion vlan = (VlanIdCriterion) criterion(
+                obj.conditions(), Criterion.Type.VLAN_VID);
+        final EthCriterion ethDst = (EthCriterion) criterion(
+                obj.conditions(), Criterion.Type.ETH_DST);
+        final EthCriterion ethDstMasked = (EthCriterion) criterion(
+                obj.conditions(), Criterion.Type.ETH_DST_MASKED);
+
+        ingressPortVlanRule(obj, inPort, vlan, resultBuilder);
+        fwdClassifierRules(obj, inPort, ethDst, ethDstMasked, resultBuilder);
+
+        return resultBuilder.build();
+    }
+
+    private void ingressPortVlanRule(
+            FilteringObjective obj,
+            Criterion inPortCriterion,
+            VlanIdCriterion vlanCriterion,
+            ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        final boolean vlanValid = vlanCriterion != null
+                && !vlanCriterion.vlanId().equals(VlanId.NONE);
+
+        final TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
+                .add(inPortCriterion)
+                .add(vlanValid ? VLAN_VALID : VLAN_INVALID);
+        if (vlanValid) {
+            selector.add(vlanCriterion);
+        }
+
+        final TrafficTreatment treatment;
+        if (obj.type().equals(FilteringObjective.Type.DENY)) {
+            treatment = DefaultTrafficTreatment.builder()
+                    .piTableAction(DENY)
+                    .build();
+        } else {
+            treatment = obj.meta() == null
+                    ? DefaultTrafficTreatment.emptyTreatment() : obj.meta();
+        }
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN,
+                selector.build(), treatment));
+    }
+
+    private void fwdClassifierRules(
+            FilteringObjective obj,
+            PortCriterion inPortCriterion,
+            EthCriterion ethDstCriterion,
+            EthCriterion ethDstMaskedCriterion,
+            ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        final List<FlowRule> flowRules = Lists.newArrayList();
+
+        final PortNumber inPort = inPortCriterion.port();
+        if (ethDstCriterion == null) {
+            if (ethDstMaskedCriterion == null) {
+                // No match. Do bridging (default action).
+                return;
+            }
+            // Masked fwd classifier rule
+            final MacAddress dstMac = ethDstMaskedCriterion.mac();
+            final MacAddress dstMacMask = ethDstMaskedCriterion.mask();
+            flowRules.add(maskedFwdClassifierRule(inPort, dstMac, dstMacMask, obj));
+        } else {
+            final MacAddress dstMac = ethDstCriterion.mac();
+            flowRules.addAll(ipFwdClassifierRules(inPort, dstMac, obj));
+            flowRules.add(mplsFwdClassifierRule(inPort, dstMac, obj));
+        }
+
+        for (FlowRule f : flowRules) {
+            resultBuilder.addFlowRule(f);
+        }
+    }
+
+    private FlowRule maskedFwdClassifierRule(
+            PortNumber inPort, MacAddress dstMac, MacAddress dstMacMask,
+            FilteringObjective obj)
+            throws FabricPipelinerException {
+        final TrafficTreatment treatment;
+        final short ethType;
+        if (dstMac.equals(MacAddress.IPV4_MULTICAST)
+                && dstMacMask.equals(MacAddress.IPV4_MULTICAST_MASK)) {
+            treatment = fwdClassifierTreatment(FWD_IPV4_ROUTING);
+            ethType = Ethernet.TYPE_IPV4;
+        } else if (dstMac.equals(MacAddress.IPV6_MULTICAST)
+                && dstMacMask.equals(MacAddress.IPV6_MULTICAST_MASK)) {
+            treatment = fwdClassifierTreatment(FWD_IPV6_ROUTING);
+            ethType = Ethernet.TYPE_IPV6;
+        } else {
+            throw new FabricPipelinerException(format(
+                    "Unsupported masked Ethernet address for fwd " +
+                            "classifier rule (mac=%s, mask=%s)",
+                    dstMac, dstMacMask));
+        }
+        return fwdClassifierRule(inPort, ethType, dstMac, dstMacMask, treatment, obj);
+    }
+
+    private Collection<FlowRule> ipFwdClassifierRules(
+            PortNumber inPort, MacAddress dstMac, FilteringObjective obj)
+            throws FabricPipelinerException {
+        final Collection<FlowRule> flowRules = Lists.newArrayList();
+        flowRules.add(fwdClassifierRule(
+                inPort, Ethernet.TYPE_IPV4, dstMac, null,
+                fwdClassifierTreatment(FWD_IPV4_ROUTING), obj));
+        flowRules.add(fwdClassifierRule(
+                inPort, Ethernet.TYPE_IPV6, dstMac, null,
+                fwdClassifierTreatment(FWD_IPV6_ROUTING), obj));
+        return flowRules;
+    }
+
+    private FlowRule mplsFwdClassifierRule(
+            PortNumber inPort, MacAddress dstMac, FilteringObjective obj)
+            throws FabricPipelinerException {
+        return fwdClassifierRule(
+                inPort, Ethernet.MPLS_UNICAST, dstMac, null,
+                fwdClassifierTreatment(FWD_MPLS), obj);
+    }
+
+    private FlowRule fwdClassifierRule(
+            PortNumber inPort, short ethType, MacAddress dstMac, MacAddress dstMacMask,
+            TrafficTreatment treatment, FilteringObjective obj)
+            throws FabricPipelinerException {
+        final TrafficSelector selector = DefaultTrafficSelector.builder()
+                .matchInPort(inPort)
+                .matchEthType(ethType)
+                .matchEthDstMasked(dstMac, dstMacMask == null
+                        ? MacAddress.EXACT_MASK : dstMacMask)
+                .build();
+        return flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER,
+                selector, treatment);
+    }
+
+    private TrafficTreatment fwdClassifierTreatment(byte fwdType) {
+        final PiActionParam param = new PiActionParam(FabricConstants.FWD_TYPE, fwdType);
+        final PiAction action = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE)
+                .withParameter(param)
+                .build();
+        return DefaultTrafficTreatment.builder()
+                .piTableAction(action)
+                .build();
+
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java
index 65e3a25..4e13a74 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java
@@ -18,14 +18,19 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.onlab.packet.MacAddress;
 import org.onosproject.net.flow.criteria.Criterion;
-import org.onosproject.net.flow.criteria.EthCriterion;
 import org.onosproject.net.flowobjective.ForwardingObjective;
+import org.slf4j.Logger;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.onosproject.net.flow.criteria.Criterion.Type.ETH_DST;
 import static org.onosproject.net.flow.criteria.Criterion.Type.ETH_TYPE;
@@ -34,107 +39,214 @@
 import static org.onosproject.net.flow.criteria.Criterion.Type.MPLS_BOS;
 import static org.onosproject.net.flow.criteria.Criterion.Type.MPLS_LABEL;
 import static org.onosproject.net.flow.criteria.Criterion.Type.VLAN_VID;
+import static org.onosproject.pipelines.fabric.pipeliner.ForwardingFunctionTypeCommons.MATCH_ETH_DST_NONE;
+import static org.onosproject.pipelines.fabric.pipeliner.ForwardingFunctionTypeCommons.MATCH_ETH_TYPE_IPV4;
+import static org.onosproject.pipelines.fabric.pipeliner.ForwardingFunctionTypeCommons.MATCH_ETH_TYPE_IPV6;
+import static org.onosproject.pipelines.fabric.pipeliner.ForwardingFunctionTypeCommons.MATCH_ETH_TYPE_MPLS;
+import static org.onosproject.pipelines.fabric.pipeliner.ForwardingFunctionTypeCommons.MATCH_MPLS_BOS_FALSE;
+import static org.onosproject.pipelines.fabric.pipeliner.ForwardingFunctionTypeCommons.MATCH_MPLS_BOS_TRUE;
+import static org.slf4j.LoggerFactory.getLogger;
 
-public enum ForwardingFunctionType {
+/**
+ * Forwarding function types (FFTs) that can represent a given forwarding
+ * objective. Each FFT is defined by a subset of criterion types expected to be
+ * found in the selector of the given objective, and, optionally, by their
+ * respective values (criterion instances) to match or to mismatch.
+ */
+enum ForwardingFunctionType {
     /**
-     * L2 unicast, with vlan id + mac address criterion.
+     * L2 unicast.
      */
-    L2_UNICAST,
+    L2_UNICAST(
+            Sets.newHashSet(VLAN_VID, ETH_DST), // Expected criterion types.
+            Collections.emptyList(), // Criteria to match.
+            Lists.newArrayList(MATCH_ETH_DST_NONE)), // Criteria NOT to match.
 
     /**
-     * L2 broadcast, with vlan id criterion only.
+     * L2 broadcast.
      */
-    L2_BROADCAST,
+    L2_BROADCAST(
+            Sets.newHashSet(VLAN_VID, ETH_DST),
+            Lists.newArrayList(MATCH_ETH_DST_NONE),
+            Collections.emptyList()),
+    L2_BROADCAST_ALIAS(
+            Sets.newHashSet(VLAN_VID),
+            Collections.emptyList(),
+            Collections.emptyList(),
+            L2_BROADCAST), // (Optional) FFT to return if selected.
 
     /**
-     * IPv4 unicast, with EtherType and IPv4 unicast destination address.
+     * IPv4 unicast.
      */
-    IPV4_ROUTING,
+    IPV4_ROUTING(
+            Sets.newHashSet(ETH_TYPE, IPV4_DST),
+            Lists.newArrayList(MATCH_ETH_TYPE_IPV4),
+            Collections.emptyList()),
 
     /**
-     * IPv6 unicast, with EtherType and IPv6 unicast destination address.
+     * IPv4 multicast.
      */
-    IPV6_ROUTING,
+    IPV4_ROUTING_MULTICAST(
+            Sets.newHashSet(ETH_TYPE, VLAN_VID, IPV4_DST),
+            Lists.newArrayList(MATCH_ETH_TYPE_IPV4),
+            Collections.emptyList()),
 
     /**
-     * MPLS, with EtherType, MPLS label and MPLS BOS(true) criterion.
+     * IPv6 unicast.
      */
-    MPLS,
+    IPV6_ROUTING(
+            Sets.newHashSet(ETH_TYPE, IPV6_DST),
+            Lists.newArrayList(MATCH_ETH_TYPE_IPV6),
+            Collections.emptyList()),
 
     /**
-     * Pseudo-wire, with EtherType, MPLS label and MPLS BOS(false) criterion.
+     * IPv6 multicast.
      */
-    PW,
+    IPV6_ROUTING_MULTICAST(
+            Sets.newHashSet(ETH_TYPE, VLAN_VID, IPV6_DST),
+            Lists.newArrayList(MATCH_ETH_TYPE_IPV6),
+            Collections.emptyList()),
+
+    /**
+     * MPLS segment routing.
+     */
+    MPLS_SEGMENT_ROUTING(
+            Sets.newHashSet(ETH_TYPE, MPLS_LABEL, MPLS_BOS),
+            Lists.newArrayList(MATCH_ETH_TYPE_MPLS, MATCH_MPLS_BOS_TRUE),
+            Collections.emptyList()),
+
+    /**
+     * Pseudo-wire.
+     */
+    PSEUDO_WIRE(
+            Sets.newHashSet(ETH_TYPE, MPLS_LABEL, MPLS_BOS),
+            Lists.newArrayList(MATCH_ETH_TYPE_MPLS, MATCH_MPLS_BOS_FALSE),
+            Collections.emptyList()),
 
     /**
      * Unsupported type.
      */
-    UNSUPPORTED;
+    UNKNOWN(
+            Collections.emptySet(),
+            Collections.emptyList(),
+            Collections.emptyList());
 
-    // Different criteria combinations for different FFT
-    private static final Set<Criterion.Type> L2_UNI_CRITERIA_TYPE =
-            ImmutableSet.of(VLAN_VID, ETH_DST);
-    private static final Set<Criterion.Type> L2_BRC_CRITERIA_TYPE =
-            ImmutableSet.of(VLAN_VID);
-    private static final Set<Criterion.Type> IPV4_UNI_CRITERIA_TYPE =
-            ImmutableSet.of(ETH_TYPE, IPV4_DST);
-    private static final Set<Criterion.Type> IPV4_MCAST_CRITERIA_TYPE =
-            ImmutableSet.of(ETH_TYPE, VLAN_VID, IPV4_DST);
-    private static final Set<Criterion.Type> IPV6_UNI_CRITERIA_TYPE =
-            ImmutableSet.of(ETH_TYPE, IPV6_DST);
-    private static final Set<Criterion.Type> IPV6_MCAST_CRITERIA_TYPE =
-            ImmutableSet.of(ETH_TYPE, VLAN_VID, IPV6_DST);
-    private static final Set<Criterion.Type> MPLS_UNI_CRITERIA_TYPE =
-            ImmutableSet.of(ETH_TYPE, MPLS_LABEL, MPLS_BOS);
+    private static final Logger log = getLogger(ForwardingFunctionType.class);
 
-    private static final Map<Set<Criterion.Type>, ForwardingFunctionType> FFT_MAP =
-            ImmutableMap.<Set<Criterion.Type>, ForwardingFunctionType>builder()
-                    .put(L2_UNI_CRITERIA_TYPE, L2_UNICAST)
-                    .put(L2_BRC_CRITERIA_TYPE, L2_BROADCAST)
-                    .put(IPV4_UNI_CRITERIA_TYPE, IPV4_ROUTING)
-                    .put(IPV4_MCAST_CRITERIA_TYPE, IPV4_ROUTING)
-                    .put(IPV6_UNI_CRITERIA_TYPE, IPV6_ROUTING)
-                    .put(IPV6_MCAST_CRITERIA_TYPE, IPV6_ROUTING)
-                    .put(MPLS_UNI_CRITERIA_TYPE, MPLS)
-                    .build();
+    private final Set<Criterion.Type> expectedCriterionTypes;
+    private final Map<Criterion.Type, List<Criterion>> matchCriteria;
+    private final Map<Criterion.Type, List<Criterion>> mismatchCriteria;
+    private final ForwardingFunctionType originalType;
 
     /**
-     * Gets forwarding function type of the forwarding objective.
+     * Creates a new FFT.
      *
-     * @param fwd the forwarding objective
-     * @return forwarding function type of the forwarding objective
+     * @param expectedCriterionTypes expected criterion types
+     * @param matchCriteria          criterion instances to match
+     * @param mismatchCriteria       criterion instance not to be matched
      */
-    public static ForwardingFunctionType getForwardingFunctionType(ForwardingObjective fwd) {
-        Set<Criterion.Type> criteriaType = Sets.newHashSet();
-        //omit the criterion of ethDst type with the value of MacAddress.NONE since it indicates L2 broadcast
-        //if not, the objective is treated as L2 unicast
-        fwd.selector().criteria().stream().filter(criterion -> !ethDstIndicatesBroadcast(criterion))
-                .map(Criterion::type)
-                .forEach(criteriaType::add);
-
-        if (fwd.meta() != null) {
-            fwd.meta().criteria().stream().filter(criterion -> !ethDstIndicatesBroadcast(criterion))
-                    .map(Criterion::type)
-                    .forEach(criteriaType::add);
-        }
-
-        return FFT_MAP.getOrDefault(criteriaType, UNSUPPORTED);
+    ForwardingFunctionType(Set<Criterion.Type> expectedCriterionTypes,
+                           Collection<Criterion> matchCriteria,
+                           Collection<Criterion> mismatchCriteria) {
+        this(expectedCriterionTypes, matchCriteria, mismatchCriteria, null);
     }
 
     /**
-     * Segment Routing (SR) app. sets ethDst criterion to MacAddress.NONE for broadcast rules
-     * and demands drivers to treat the flow rules containing this criterion as broadcast rule.
+     * Creates a new alias FFT that if matched, should return the given original
+     * FFT.
      *
-     * This method checks the type and value of the criterion and detects whether it constitutes
-     * broadcast or not.
-     *
-     * For more details check RoutingRulePopulator.updateSubnetBroadcastRule method of SR app.
-     *
-     * @param criterion Criterion object
-     * @return true if the type is ETH_DST and the mac value equals to MacAddress.NONE; false otherwise.
+     * @param expectedCriterionTypes expected criterion types
+     * @param matchCriteria          criterion instances to match
+     * @param mismatchCriteria       criterion instance not to be matched
+     * @param original               original FFT to return
      */
-    private static boolean ethDstIndicatesBroadcast(Criterion criterion) {
-        return criterion.type().equals(Criterion.Type.ETH_DST) &&
-                ((EthCriterion) criterion).mac().equals(MacAddress.NONE);
+    ForwardingFunctionType(Set<Criterion.Type> expectedCriterionTypes,
+                           Collection<Criterion> matchCriteria,
+                           Collection<Criterion> mismatchCriteria,
+                           ForwardingFunctionType original) {
+        this.expectedCriterionTypes = ImmutableSet.copyOf(expectedCriterionTypes);
+        this.matchCriteria = typeToCriteriaMap(matchCriteria);
+        this.mismatchCriteria = typeToCriteriaMap(mismatchCriteria);
+        this.originalType = original == null ? this : original;
+    }
+
+    /**
+     * Attempts to guess the forwarding function type of the given forwarding
+     * objective.
+     *
+     * @param fwd the forwarding objective
+     * @return forwarding function type. {@link #UNKNOWN} if the FFT cannot be
+     * determined.
+     */
+    public static ForwardingFunctionType getForwardingFunctionType(ForwardingObjective fwd) {
+        final Set<Criterion> criteria = criteriaIncludingMeta(fwd);
+        final Set<Criterion.Type> criterionTypes = criteria.stream()
+                .map(Criterion::type).collect(Collectors.toSet());
+
+        final List<ForwardingFunctionType> candidates = Arrays.stream(ForwardingFunctionType.values())
+                // Keep FFTs which expected criterion types are the same found
+                // in the fwd objective.
+                .filter(fft -> fft.expectedCriterionTypes.equals(criterionTypes))
+                // Keep FFTs which match criteria are found in the fwd objective.
+                .filter(fft -> matchFft(criteria, fft))
+                // Keep FFTs which mismatch criteria are NOT found in the objective.
+                .filter(fft -> mismatchFft(criteria, fft))
+                .collect(Collectors.toList());
+
+        switch (candidates.size()) {
+            case 1:
+                return candidates.get(0).originalType;
+            case 0:
+                return UNKNOWN;
+            default:
+                log.warn("Multiple FFT candidates found: {} [{}]", candidates, fwd);
+                return UNKNOWN;
+        }
+    }
+
+    private static boolean matchFft(Collection<Criterion> criteria, ForwardingFunctionType fft) {
+        return matchOrMismatchFft(criteria, fft.matchCriteria, false);
+    }
+
+    private static boolean mismatchFft(Collection<Criterion> criteria, ForwardingFunctionType fft) {
+        return matchOrMismatchFft(criteria, fft.mismatchCriteria, true);
+    }
+
+    private static boolean matchOrMismatchFft(
+            Collection<Criterion> criteria,
+            Map<Criterion.Type, List<Criterion>> criteriaToMatch,
+            boolean mismatch) {
+        final Map<Criterion.Type, Criterion> givenCriteria = typeToCriterionMap(criteria);
+        for (Criterion.Type typeToMatch : criteriaToMatch.keySet()) {
+            if (!givenCriteria.containsKey(typeToMatch)) {
+                return false;
+            }
+            final boolean matchFound = criteriaToMatch.get(typeToMatch).stream()
+                    .anyMatch(c -> mismatch != givenCriteria.get(c.type()).equals(c));
+            if (!matchFound) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static Set<Criterion> criteriaIncludingMeta(ForwardingObjective fwd) {
+        final Set<Criterion> criteria = Sets.newHashSet();
+        criteria.addAll(fwd.selector().criteria());
+        // FIXME: Is this really needed? Meta is such an ambiguous field...
+        if (fwd.meta() != null) {
+            criteria.addAll(fwd.meta().criteria());
+        }
+        return criteria;
+    }
+
+    private static Map<Criterion.Type, List<Criterion>> typeToCriteriaMap(Collection<Criterion> criteria) {
+        return criteria.stream().collect(Collectors.groupingBy(Criterion::type));
+    }
+
+    private static Map<Criterion.Type, Criterion> typeToCriterionMap(Collection<Criterion> criteria) {
+        final ImmutableMap.Builder<Criterion.Type, Criterion> mapBuilder = ImmutableMap.builder();
+        criteria.forEach(c -> mapBuilder.put(c.type(), c));
+        return mapBuilder.build();
     }
 }
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeCommons.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeCommons.java
new file mode 100644
index 0000000..0c898c5
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeCommons.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.pipeliner;
+
+import org.onlab.packet.EthType;
+import org.onlab.packet.MacAddress;
+import org.onosproject.net.flow.criteria.Criteria;
+import org.onosproject.net.flow.criteria.Criterion;
+
+/**
+ * Constants common to ForwardingFunctionType operations.
+ */
+final class ForwardingFunctionTypeCommons {
+
+    static final Criterion MATCH_ETH_TYPE_IPV4 = Criteria.matchEthType(
+      EthType.EtherType.IPV4.ethType());
+    static final Criterion MATCH_ETH_TYPE_IPV6 = Criteria.matchEthType(
+      EthType.EtherType.IPV6.ethType());
+    static final Criterion MATCH_ETH_DST_NONE = Criteria.matchEthDst(
+      MacAddress.NONE);
+    static final Criterion MATCH_ETH_TYPE_MPLS = Criteria.matchEthType(
+      EthType.EtherType.MPLS_UNICAST.ethType());
+    static final Criterion MATCH_MPLS_BOS_TRUE = Criteria.matchMplsBos(true);
+    static final Criterion MATCH_MPLS_BOS_FALSE = Criteria.matchMplsBos(false);
+
+    private ForwardingFunctionTypeCommons() {
+        // hides constructor.
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingObjectiveTranslator.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingObjectiveTranslator.java
new file mode 100644
index 0000000..5647d26
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingObjectiveTranslator.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.pipeliner;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.MacAddress;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.criteria.EthCriterion;
+import org.onosproject.net.flow.criteria.IPCriterion;
+import org.onosproject.net.flow.criteria.MplsCriterion;
+import org.onosproject.net.flow.criteria.VlanIdCriterion;
+import org.onosproject.net.flowobjective.ForwardingObjective;
+import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.pi.model.PiActionId;
+import org.onosproject.net.pi.model.PiTableId;
+import org.onosproject.net.pi.runtime.PiAction;
+import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.pipelines.fabric.FabricCapabilities;
+import org.onosproject.pipelines.fabric.FabricConstants;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
+import static org.onosproject.pipelines.fabric.FabricUtils.criterionNotNull;
+
+/**
+ * ObjectiveTranslator implementation ForwardingObjective.
+ */
+class ForwardingObjectiveTranslator
+        extends AbstractObjectiveTranslator<ForwardingObjective> {
+
+    private static final List<String> DEFAULT_ROUTE_PREFIXES = Lists.newArrayList(
+            "0.0.0.0/1", "128.0.0.0/1");
+
+    private static final Set<Criterion.Type> ACL_CRITERIA = ImmutableSet.of(
+            Criterion.Type.IN_PORT,
+            Criterion.Type.IN_PHY_PORT,
+            Criterion.Type.ETH_DST,
+            Criterion.Type.ETH_DST_MASKED,
+            Criterion.Type.ETH_SRC,
+            Criterion.Type.ETH_SRC_MASKED,
+            Criterion.Type.ETH_TYPE,
+            Criterion.Type.VLAN_VID,
+            Criterion.Type.IP_PROTO,
+            Criterion.Type.IPV4_SRC,
+            Criterion.Type.IPV4_DST,
+            Criterion.Type.TCP_SRC,
+            Criterion.Type.TCP_SRC_MASKED,
+            Criterion.Type.TCP_DST,
+            Criterion.Type.TCP_DST_MASKED,
+            Criterion.Type.UDP_SRC,
+            Criterion.Type.UDP_SRC_MASKED,
+            Criterion.Type.UDP_DST,
+            Criterion.Type.UDP_DST_MASKED,
+            Criterion.Type.ICMPV4_TYPE,
+            Criterion.Type.ICMPV4_CODE,
+            Criterion.Type.PROTOCOL_INDEPENDENT);
+
+    private static final Map<PiTableId, PiActionId> NEXT_ID_ACTIONS = ImmutableMap.<PiTableId, PiActionId>builder()
+            .put(FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING,
+                 FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING)
+            .put(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
+                 FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4)
+            .put(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6,
+                 FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V6)
+            .put(FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS,
+                 FabricConstants.FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT)
+            .build();
+
+    ForwardingObjectiveTranslator(DeviceId deviceId, FabricCapabilities capabilities) {
+        super(deviceId, capabilities);
+    }
+
+    @Override
+    public ObjectiveTranslation doTranslate(ForwardingObjective obj)
+            throws FabricPipelinerException {
+        final ObjectiveTranslation.Builder resultBuilder =
+                ObjectiveTranslation.builder();
+        switch (obj.flag()) {
+            case SPECIFIC:
+                processSpecificFwd(obj, resultBuilder);
+                break;
+            case VERSATILE:
+                processVersatileFwd(obj, resultBuilder);
+                break;
+            case EGRESS:
+            default:
+                log.warn("Unsupported ForwardingObjective type '{}'", obj.flag());
+                return ObjectiveTranslation.ofError(ObjectiveError.UNSUPPORTED);
+        }
+        return resultBuilder.build();
+    }
+
+    private void processVersatileFwd(ForwardingObjective obj,
+                                     ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        final Set<Criterion.Type> unsupportedCriteria = obj.selector().criteria()
+                .stream()
+                .map(Criterion::type)
+                .filter(t -> !ACL_CRITERIA.contains(t))
+                .collect(Collectors.toSet());
+
+        if (!unsupportedCriteria.isEmpty()) {
+            throw new FabricPipelinerException(format(
+                    "unsupported ACL criteria %s", unsupportedCriteria.toString()));
+        }
+
+        aclRule(obj, resultBuilder);
+    }
+
+    private void processSpecificFwd(ForwardingObjective obj,
+                                    ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        final Set<Criterion> criteriaWithMeta = Sets.newHashSet(obj.selector().criteria());
+
+        // FIXME: Is this really needed? Meta is such an ambiguous field...
+        // Why would we match on a META field?
+        if (obj.meta() != null) {
+            criteriaWithMeta.addAll(obj.meta().criteria());
+        }
+
+        final ForwardingFunctionType fft = ForwardingFunctionType.getForwardingFunctionType(obj);
+
+        switch (fft) {
+            case UNKNOWN:
+                throw new FabricPipelinerException(
+                        "unable to detect forwarding function type");
+            case L2_UNICAST:
+                bridgingRule(obj, criteriaWithMeta, resultBuilder, false);
+                break;
+            case L2_BROADCAST:
+                bridgingRule(obj, criteriaWithMeta, resultBuilder, true);
+                break;
+            case IPV4_ROUTING:
+            case IPV4_ROUTING_MULTICAST:
+                ipv4RoutingRule(obj, criteriaWithMeta, resultBuilder);
+                break;
+            case MPLS_SEGMENT_ROUTING:
+                mplsRule(obj, criteriaWithMeta, resultBuilder);
+                break;
+            case IPV6_ROUTING:
+            case IPV6_ROUTING_MULTICAST:
+            default:
+                throw new FabricPipelinerException(format(
+                        "unsupported forwarding function type '%s'",
+                        fft));
+        }
+    }
+
+    private void bridgingRule(ForwardingObjective obj, Set<Criterion> criteriaWithMeta,
+                              ObjectiveTranslation.Builder resultBuilder,
+                              boolean broadcast)
+            throws FabricPipelinerException {
+
+        final VlanIdCriterion vlanIdCriterion = (VlanIdCriterion) criterionNotNull(
+                criteriaWithMeta, Criterion.Type.VLAN_VID);
+        final TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
+                .add(vlanIdCriterion);
+
+        if (!broadcast) {
+            final EthCriterion ethDstCriterion = (EthCriterion) criterionNotNull(
+                    obj.selector(), Criterion.Type.ETH_DST);
+            selector.matchEthDstMasked(ethDstCriterion.mac(), MacAddress.EXACT_MASK);
+        }
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING, selector.build()));
+    }
+
+    private void ipv4RoutingRule(ForwardingObjective obj, Set<Criterion> criteriaWithMeta,
+                                 ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+        final IPCriterion ipDstCriterion = (IPCriterion) criterionNotNull(
+                criteriaWithMeta, Criterion.Type.IPV4_DST);
+
+        if (ipDstCriterion.ip().prefixLength() == 0) {
+            defaultIpv4Route(obj, resultBuilder);
+            return;
+        }
+
+        final TrafficSelector selector = DefaultTrafficSelector.builder()
+                .add(ipDstCriterion)
+                .build();
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4, selector));
+    }
+
+    private void defaultIpv4Route(ForwardingObjective obj,
+                                  ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        // Hack to work around the inability to program default rules.
+        for (String prefix : DEFAULT_ROUTE_PREFIXES) {
+            final TrafficSelector selector = DefaultTrafficSelector.builder()
+                    .matchIPDst(IpPrefix.valueOf(prefix)).build();
+            resultBuilder.addFlowRule(flowRule(
+                    obj, FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4, selector));
+        }
+    }
+
+    private void mplsRule(ForwardingObjective obj, Set<Criterion> criteriaWithMeta,
+                          ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        final MplsCriterion mplsCriterion = (MplsCriterion) criterionNotNull(
+                criteriaWithMeta, Criterion.Type.MPLS_LABEL);
+        final TrafficSelector selector = DefaultTrafficSelector.builder()
+                .add(mplsCriterion)
+                .build();
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS, selector));
+    }
+
+    private void aclRule(ForwardingObjective obj,
+                         ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_ACL_ACL, obj.selector()));
+    }
+
+    private FlowRule flowRule(
+            ForwardingObjective obj, PiTableId tableId, TrafficSelector selector)
+            throws FabricPipelinerException {
+        return flowRule(obj, tableId, selector, nextIdOrTreatment(obj, tableId));
+    }
+
+    private static TrafficTreatment nextIdOrTreatment(
+            ForwardingObjective obj, PiTableId tableId)
+            throws FabricPipelinerException {
+        if (obj.nextId() == null) {
+            return obj.treatment();
+        } else {
+            if (!NEXT_ID_ACTIONS.containsKey(tableId)) {
+                throw new FabricPipelinerException(format(
+                        "BUG? no next_id action set for table %s", tableId));
+            }
+            return DefaultTrafficTreatment.builder()
+                    .piTableAction(
+                            setNextIdAction(obj.nextId(),
+                                            NEXT_ID_ACTIONS.get(tableId)))
+                    .build();
+        }
+    }
+
+    private static PiAction setNextIdAction(Integer nextId, PiActionId actionId) {
+        final PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, nextId);
+        return PiAction.builder()
+                .withId(actionId)
+                .withParameter(nextIdParam)
+                .build();
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/NextObjectiveTranslator.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/NextObjectiveTranslator.java
new file mode 100644
index 0000000..e45768a
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/NextObjectiveTranslator.java
@@ -0,0 +1,413 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.pipeliner;
+
+import com.google.common.collect.Lists;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.criteria.PiCriterion;
+import org.onosproject.net.flow.criteria.VlanIdCriterion;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.flowobjective.DefaultNextTreatment;
+import org.onosproject.net.flowobjective.NextObjective;
+import org.onosproject.net.flowobjective.NextTreatment;
+import org.onosproject.net.flowobjective.Objective;
+import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.group.DefaultGroupBucket;
+import org.onosproject.net.group.DefaultGroupDescription;
+import org.onosproject.net.group.DefaultGroupKey;
+import org.onosproject.net.group.GroupBucket;
+import org.onosproject.net.group.GroupBuckets;
+import org.onosproject.net.group.GroupDescription;
+import org.onosproject.net.group.GroupKey;
+import org.onosproject.net.pi.model.PiTableId;
+import org.onosproject.net.pi.runtime.PiAction;
+import org.onosproject.net.pi.runtime.PiActionGroupId;
+import org.onosproject.net.pi.runtime.PiActionParam;
+import org.onosproject.net.pi.runtime.PiGroupKey;
+import org.onosproject.pipelines.fabric.FabricCapabilities;
+import org.onosproject.pipelines.fabric.FabricConstants;
+import org.onosproject.pipelines.fabric.FabricUtils;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType.VLAN_POP;
+import static org.onosproject.pipelines.fabric.FabricUtils.criterion;
+import static org.onosproject.pipelines.fabric.FabricUtils.l2Instruction;
+import static org.onosproject.pipelines.fabric.FabricUtils.outputPort;
+
+/**
+ * ObjectiveTranslator implementation for NextObjective.
+ */
+class NextObjectiveTranslator
+        extends AbstractObjectiveTranslator<NextObjective> {
+
+    NextObjectiveTranslator(DeviceId deviceId, FabricCapabilities capabilities) {
+        super(deviceId, capabilities);
+    }
+
+    @Override
+    public ObjectiveTranslation doTranslate(NextObjective obj)
+            throws FabricPipelinerException {
+
+        final ObjectiveTranslation.Builder resultBuilder =
+                ObjectiveTranslation.builder();
+
+        switch (obj.type()) {
+            case SIMPLE:
+                simpleNext(obj, resultBuilder, false);
+                break;
+            case HASHED:
+                hashedNext(obj, resultBuilder);
+                break;
+            case BROADCAST:
+                multicastNext(obj, resultBuilder);
+                break;
+            default:
+                log.warn("Unsupported NextObjective type '{}'", obj);
+                return ObjectiveTranslation.ofError(ObjectiveError.UNSUPPORTED);
+        }
+
+        if (!isGroupModifyOp(obj)) {
+            // Generate next VLAN rules.
+            nextVlan(obj, resultBuilder);
+        }
+
+        return resultBuilder.build();
+    }
+
+    private void nextVlan(NextObjective obj,
+                          ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+        if (obj.meta() == null) {
+            // Do nothing if there is no metadata in the NextObjective.
+            return;
+        }
+
+        final VlanIdCriterion vlanIdCriterion = (VlanIdCriterion) criterion(
+                obj.meta().criteria(), Criterion.Type.VLAN_VID);
+        if (vlanIdCriterion == null) {
+            // Do nothing if we can't find vlan from NextObjective metadata.
+            return;
+        }
+
+        // A VLAN ID as meta of a NextObjective indicates that packets matching
+        // the given next ID should be set with such VLAN ID.
+        final TrafficSelector selector = nextIdSelector(obj.id());
+        final TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .setVlanId(vlanIdCriterion.vlanId())
+                .build();
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_NEXT_NEXT_VLAN,
+                selector, treatment));
+    }
+
+    private void simpleNext(NextObjective obj,
+                            ObjectiveTranslation.Builder resultBuilder,
+                            boolean forceSimple)
+            throws FabricPipelinerException {
+
+        if (capabilities.hasHashedTable()) {
+            // Use hashed table when possible.
+            hashedNext(obj, resultBuilder);
+            return;
+        }
+
+        if (obj.nextTreatments().isEmpty()) {
+            // Do nothing.
+            return;
+        } else if (!forceSimple && obj.nextTreatments().size() != 1) {
+            throw new FabricPipelinerException(format(
+                    "SIMPLE NextObjective should contain only 1 treatment, found %d",
+                    obj.nextTreatments().size()), ObjectiveError.BADPARAMS);
+        }
+
+        final TrafficSelector selector = nextIdSelector(obj.id());
+
+        final List<DefaultNextTreatment> treatments = defaultNextTreatmentsOrFail(
+                obj.nextTreatments());
+
+        if (forceSimple && treatments.size() > 1) {
+            log.warn("Forcing SIMPLE behavior for NextObjective with {} treatments []",
+                     treatments.size(), obj);
+        }
+
+        // If not forcing, we are essentially extracting the only available treatment.
+        final TrafficTreatment treatment = defaultNextTreatmentsOrFail(
+                obj.nextTreatments()).get(0).treatment();
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE,
+                selector, treatment));
+
+        handleEgress(obj, treatment, resultBuilder, false);
+    }
+
+    private void hashedNext(NextObjective obj,
+                            ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        if (!capabilities.hasHashedTable()) {
+            simpleNext(obj, resultBuilder, true);
+            return;
+        }
+
+        // Updated result builder with hashed group.
+        final int groupId = selectGroup(obj, resultBuilder);
+
+        if (isGroupModifyOp(obj)) {
+            // No changes to flow rules.
+            return;
+        }
+
+        final TrafficSelector selector = nextIdSelector(obj.id());
+        final TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .piTableAction(PiActionGroupId.of(groupId))
+                .build();
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_NEXT_HASHED,
+                selector, treatment));
+    }
+
+    private void handleEgress(NextObjective obj, TrafficTreatment treatment,
+                              ObjectiveTranslation.Builder resultBuilder,
+                              boolean strict)
+            throws FabricPipelinerException {
+        final PortNumber outPort = outputPort(treatment);
+        final Instruction popVlanInst = l2Instruction(treatment, VLAN_POP);
+        if (popVlanInst != null && outPort != null) {
+            if (strict && treatment.allInstructions().size() > 2) {
+                throw new FabricPipelinerException(
+                        "Treatment contains instructions other " +
+                                "than OUTPUT and VLAN_POP, cannot generate " +
+                                "egress rules");
+            }
+            egressVlanPop(outPort, obj, resultBuilder);
+        }
+    }
+
+    private void egressVlanPop(PortNumber outPort, NextObjective obj,
+                               ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        if (obj.meta() == null) {
+            throw new FabricPipelinerException(
+                    "Cannot process egress pop VLAN rule, NextObjective has null meta",
+                    ObjectiveError.BADPARAMS);
+        }
+
+        final VlanIdCriterion vlanIdCriterion = (VlanIdCriterion) criterion(
+                obj.meta(), Criterion.Type.VLAN_VID);
+        if (vlanIdCriterion == null) {
+            throw new FabricPipelinerException(
+                    "Cannot process egress pop VLAN rule, missing VLAN_VID criterion " +
+                            "in NextObjective meta",
+                    ObjectiveError.BADPARAMS);
+        }
+
+        final PiCriterion egressVlanTableMatch = PiCriterion.builder()
+                .matchExact(FabricConstants.HDR_EG_PORT, outPort.toLong())
+                .build();
+        final TrafficSelector selector = DefaultTrafficSelector.builder()
+                .matchPi(egressVlanTableMatch)
+                .matchVlanId(vlanIdCriterion.vlanId())
+                .build();
+        final TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .popVlan()
+                .build();
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN,
+                selector, treatment));
+    }
+
+    private TrafficSelector nextIdSelector(int nextId) {
+        final PiCriterion nextIdCriterion = PiCriterion.builder()
+                .matchExact(FabricConstants.HDR_NEXT_ID, nextId)
+                .build();
+        return DefaultTrafficSelector.builder()
+                .matchPi(nextIdCriterion)
+                .build();
+    }
+
+    private void multicastNext(NextObjective obj,
+                               ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        // Create ALL group that will be translated to a PRE multicast entry.
+        final int groupId = allGroup(obj, resultBuilder);
+
+        if (isGroupModifyOp(obj)) {
+            // No changes to flow rules.
+            return;
+        }
+
+        final TrafficSelector selector = nextIdSelector(obj.id());
+        final PiActionParam groupIdParam = new PiActionParam(
+                FabricConstants.GROUP_ID, groupId);
+        final PiAction setMcGroupAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_MCAST_GROUP_ID)
+                .withParameter(groupIdParam)
+                .build();
+        final TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .piTableAction(setMcGroupAction)
+                .build();
+
+        resultBuilder.addFlowRule(flowRule(
+                obj, FabricConstants.FABRIC_INGRESS_NEXT_MULTICAST,
+                selector, treatment));
+    }
+
+    private int selectGroup(NextObjective obj,
+                            ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        final PiTableId hashedTableId = FabricConstants.FABRIC_INGRESS_NEXT_HASHED;
+        final List<DefaultNextTreatment> defaultNextTreatments =
+                defaultNextTreatmentsOrFail(obj.nextTreatments());
+        final List<TrafficTreatment> piTreatments = Lists.newArrayList();
+
+        for (DefaultNextTreatment t : defaultNextTreatments) {
+            // Map treatment to PI...
+            piTreatments.add(mapTreatmentToPiIfNeeded(t.treatment(), hashedTableId));
+            // ...and handle egress if necessary.
+            handleEgress(obj, t.treatment(), resultBuilder, false);
+        }
+
+        final List<GroupBucket> bucketList = piTreatments.stream()
+                .map(DefaultGroupBucket::createSelectGroupBucket)
+                .collect(Collectors.toList());
+
+        final int groupId = obj.id();
+        final PiGroupKey groupKey = new PiGroupKey(
+                hashedTableId,
+                FabricConstants.FABRIC_INGRESS_NEXT_HASHED_SELECTOR,
+                groupId);
+
+        resultBuilder.addGroup(new DefaultGroupDescription(
+                deviceId,
+                GroupDescription.Type.SELECT,
+                new GroupBuckets(bucketList),
+                groupKey,
+                groupId,
+                obj.appId()));
+
+        return groupId;
+    }
+
+    private int allGroup(NextObjective obj,
+                         ObjectiveTranslation.Builder resultBuilder)
+            throws FabricPipelinerException {
+
+        final Collection<DefaultNextTreatment> defaultNextTreatments =
+                defaultNextTreatmentsOrFail(obj.nextTreatments());
+        // No need to map treatments to PI as translation of ALL groups to PRE
+        // multicast entries is based solely on the output port.
+        for (DefaultNextTreatment t : defaultNextTreatments) {
+            handleEgress(obj, t.treatment(), resultBuilder, true);
+        }
+
+        // FIXME: this implementation supports only the case in which each
+        // switch interface is associated with only one VLAN, otherwise we would
+        // need to support replicating multiple times the same packet for the
+        // same port while setting different VLAN IDs. Hence, collect in a set.
+        final Set<PortNumber> outPorts = defaultNextTreatments.stream()
+                .map(DefaultNextTreatment::treatment)
+                .map(FabricUtils::outputPort)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        if (outPorts.size() != defaultNextTreatments.size()) {
+            throw new FabricPipelinerException(format(
+                    "Found BROADCAST NextObjective with %d treatments but " +
+                            "found only %d distinct OUTPUT port numbers, cannot " +
+                            "translate to ALL groups",
+                    defaultNextTreatments.size(), outPorts.size()),
+                                               ObjectiveError.UNSUPPORTED);
+        }
+
+        final List<GroupBucket> bucketList = outPorts.stream()
+                .map(p -> DefaultTrafficTreatment.builder().setOutput(p).build())
+                .map(DefaultGroupBucket::createAllGroupBucket)
+                .collect(Collectors.toList());
+        // FIXME: remove once support for clone sessions is available
+        // Right now we add a CPU port to all multicast groups. The egress
+        // pipeline is expected to drop replicated packets to the CPU if a clone
+        // was  not requested in the ingress pipeline.
+        bucketList.add(
+                DefaultGroupBucket.createAllGroupBucket(
+                        DefaultTrafficTreatment.builder()
+                                .setOutput(PortNumber.CONTROLLER)
+                                .build()));
+
+        final int groupId = obj.id();
+        // Use DefaultGroupKey instead of PiGroupKey as we don't have any
+        // action profile to apply to the groups of ALL type.
+        final GroupKey groupKey = new DefaultGroupKey(
+                FabricPipeliner.KRYO.serialize(groupId));
+
+        resultBuilder.addGroup(
+                new DefaultGroupDescription(
+                        deviceId,
+                        GroupDescription.Type.ALL,
+                        new GroupBuckets(bucketList),
+                        groupKey,
+                        groupId,
+                        obj.appId()));
+
+        return groupId;
+    }
+
+    private List<DefaultNextTreatment> defaultNextTreatmentsOrFail(
+            Collection<NextTreatment> nextTreatments)
+            throws FabricPipelinerException {
+        final List<DefaultNextTreatment> defaultNextTreatments = Lists.newArrayList();
+        final List<NextTreatment> unsupportedNextTreatments = Lists.newArrayList();
+        for (NextTreatment n : nextTreatments) {
+            if (n.type() == NextTreatment.Type.TREATMENT) {
+                defaultNextTreatments.add((DefaultNextTreatment) n);
+            } else {
+                unsupportedNextTreatments.add(n);
+            }
+        }
+        if (!unsupportedNextTreatments.isEmpty()) {
+            throw new FabricPipelinerException(format(
+                    "Unsupported NextTreatments: %s",
+                    unsupportedNextTreatments));
+        }
+        return defaultNextTreatments;
+    }
+
+    private boolean isGroupModifyOp(NextObjective obj) {
+        // If operation is ADD_TO_EXIST or REMOVE_FROM_EXIST, it means we modify
+        // group buckets only, no changes for flow rules.
+        return obj.op() == Objective.Operation.ADD_TO_EXISTING ||
+                obj.op() == Objective.Operation.REMOVE_FROM_EXISTING;
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ObjectiveTranslation.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ObjectiveTranslation.java
new file mode 100644
index 0000000..33ffeac
--- /dev/null
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ObjectiveTranslation.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.pipelines.fabric.pipeliner;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import org.onosproject.net.flow.FlowId;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.group.GroupDescription;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
+
+/**
+ * Result of a pipeliner translation from an objective to flows and groups.
+ */
+final class ObjectiveTranslation {
+
+    private final ImmutableMap<FlowId, FlowRule> flowRules;
+    private final ImmutableMap<Integer, GroupDescription> groups;
+    private final ObjectiveError error;
+
+    private ObjectiveTranslation(Map<FlowId, FlowRule> flowRules,
+                                 Map<Integer, GroupDescription> groups,
+                                 ObjectiveError error) {
+        this.flowRules = ImmutableMap.copyOf(flowRules);
+        this.groups = ImmutableMap.copyOf(groups);
+        this.error = error;
+    }
+
+    /**
+     * Returns flow rules of this translation.
+     *
+     * @return flow rules
+     */
+    Collection<FlowRule> flowRules() {
+        return flowRules.values();
+    }
+
+    /**
+     * Returns groups of this translation.
+     *
+     * @return groups
+     */
+    Collection<GroupDescription> groups() {
+        return groups.values();
+    }
+
+    /**
+     * Returns the error of this translation, is any.
+     *
+     * @return optional error
+     */
+    Optional<ObjectiveError> error() {
+        return Optional.ofNullable(error);
+    }
+
+    /**
+     * Creates a new builder.
+     *
+     * @return the builder
+     */
+    static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Creates a new translation that signals the given error.
+     *
+     * @param error objective error
+     * @return new objective translation
+     */
+    static ObjectiveTranslation ofError(ObjectiveError error) {
+        checkNotNull(error);
+        return new ObjectiveTranslation(
+                Collections.emptyMap(), Collections.emptyMap(), error);
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("flowRules", flowRules)
+                .add("groups", groups)
+                .add("error", error)
+                .toString();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(flowRules, groups, error);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final ObjectiveTranslation other = (ObjectiveTranslation) obj;
+        return flowRulesExactMatch(other.flowRules)
+                && Objects.equals(this.groups, other.groups)
+                && Objects.equals(this.error, other.error);
+    }
+
+    private boolean flowRulesExactMatch(Map<FlowId, FlowRule> otherFlowRules) {
+        if (otherFlowRules == null || otherFlowRules.size() != this.flowRules.size()) {
+            return false;
+        }
+        return this.flowRules.values().stream()
+                .allMatch(f -> otherFlowRules.containsKey(f.id())
+                        && otherFlowRules.get(f.id()).exactMatch(f));
+    }
+
+    /**
+     * Builder for ObjectiveTranslation. This implementation checks that flow
+     * and groups are not added when an existing one with same ID (FlowId or
+     * GroupId) has already been added.
+     */
+    static final class Builder {
+
+        private final Map<FlowId, FlowRule> flowRules = Maps.newHashMap();
+        private final Map<Integer, GroupDescription> groups = Maps.newHashMap();
+
+        // Hide default constructor
+        private Builder() {
+        }
+
+        /**
+         * Adds a flow rule to this translation.
+         *
+         * @param flowRule flow rule
+         * @return this
+         * @throws FabricPipelinerException if a FlowRule with same FlowId
+         *                                  already exists in this translation
+         */
+        Builder addFlowRule(FlowRule flowRule)
+                throws FabricPipelinerException {
+            checkNotNull(flowRule);
+            if (flowRules.containsKey(flowRule.id())) {
+                final FlowRule existingFlowRule = flowRules.get(flowRule.id());
+                if (!existingFlowRule.exactMatch(flowRule)) {
+                    throw new FabricPipelinerException(format(
+                            "Another FlowRule with same ID has already been " +
+                                    "added to this translation: existing=%s, new=%s",
+                            existingFlowRule, flowRule));
+                }
+            }
+            flowRules.put(flowRule.id(), flowRule);
+            return this;
+        }
+
+        /**
+         * Adds group to this translation.
+         *
+         * @param group group
+         * @return this
+         * @throws FabricPipelinerException if a FlowRule with same GroupId
+         *                                  already exists in this translation
+         */
+        Builder addGroup(GroupDescription group)
+                throws FabricPipelinerException {
+            checkNotNull(group);
+            if (groups.containsKey(group.givenGroupId())) {
+                final GroupDescription existingGroup = groups.get(group.givenGroupId());
+                if (!existingGroup.equals(group)) {
+                    throw new FabricPipelinerException(format(
+                            "Another Group with same ID has already been " +
+                                    "added to this translation: existing=%s, new=%s",
+                            existingGroup, group));
+                }
+            }
+            groups.put(group.givenGroupId(), group);
+            return this;
+        }
+
+        /**
+         * Creates ane translation.
+         *
+         * @return translation instance
+         */
+        ObjectiveTranslation build() {
+            return new ObjectiveTranslation(flowRules, groups, null);
+        }
+    }
+}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/PipelinerTranslationResult.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/PipelinerTranslationResult.java
deleted file mode 100644
index 575d590..0000000
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/PipelinerTranslationResult.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.pipelines.fabric.pipeliner;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.net.group.GroupDescription;
-
-import java.util.Collection;
-import java.util.Objects;
-import java.util.Optional;
-
-/**
- * Translation results from fabric pipeliner.
- */
-public final class PipelinerTranslationResult {
-    private Collection<FlowRule> flowRules;
-    private Collection<GroupDescription> groups;
-    private ObjectiveError error;
-
-    private PipelinerTranslationResult(Collection<FlowRule> flowRules,
-                                      Collection<GroupDescription> groups,
-                                      ObjectiveError error) {
-        this.flowRules = flowRules;
-        this.groups = groups;
-        this.error = error;
-    }
-
-    /**
-     * Gets flow rules from result.
-     *
-     * @return flow rules
-     */
-    public Collection<FlowRule> flowRules() {
-        return flowRules;
-    }
-
-    /**
-     * Gets groups from result.
-     *
-     * @return groups
-     */
-    public Collection<GroupDescription> groups() {
-        return groups;
-    }
-
-    /**
-     * Gets error from result.
-     *
-     * @return error of the result; empty if there is no error
-     */
-    public Optional<ObjectiveError> error() {
-        return Optional.ofNullable(error);
-    }
-
-    /**
-     * Creates a new builder.
-     *
-     * @return the builder
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("flowRules", flowRules)
-                .add("groups", groups)
-                .add("error", error)
-                .toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(flowRules, groups, error);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        final PipelinerTranslationResult other = (PipelinerTranslationResult) obj;
-        return Objects.equals(this.flowRules, other.flowRules)
-                && Objects.equals(this.groups, other.groups)
-                && Objects.equals(this.error, other.error);
-    }
-
-    /**
-     * Builder for PipelinerTranslationResult.
-     */
-    public static final class Builder {
-        private ImmutableList.Builder<FlowRule> flowRules = ImmutableList.builder();
-        private ImmutableList.Builder<GroupDescription> groups = ImmutableList.builder();
-        private ObjectiveError error = null;
-
-        // Hide default constructor
-        private Builder() {
-        }
-
-        /**
-         * Adds flow rule to the result.
-         *
-         * @param flowRule the flow rule
-         */
-        public void addFlowRule(FlowRule flowRule) {
-            flowRules.add(flowRule);
-        }
-
-        /**
-         * Adds group to the result.
-         *
-         * @param group the group
-         */
-        public void addGroup(GroupDescription group) {
-            groups.add(group);
-        }
-
-        /**
-         * Sets objective error to the result.
-         *
-         * @param error the error
-         */
-        public void setError(ObjectiveError error) {
-            this.error = error;
-        }
-
-        public PipelinerTranslationResult build() {
-            return new PipelinerTranslationResult(flowRules.build(),
-                                                  groups.build(),
-                                                  error);
-        }
-    }
-}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/package-info.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/package-info.java
index 75bf40e..de2d2ee 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/package-info.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Pipeliner for fabric.p4.
+ * Pipeliner implementation classes for fabric.p4.
  */
-package org.onosproject.pipelines.fabric.pipeliner;
\ No newline at end of file
+package org.onosproject.pipelines.fabric.pipeliner;
diff --git a/pipelines/fabric/src/main/resources/.gitignore b/pipelines/fabric/src/main/resources/.gitignore
index 4832ef2..07ae761 100644
--- a/pipelines/fabric/src/main/resources/.gitignore
+++ b/pipelines/fabric/src/main/resources/.gitignore
@@ -1 +1,2 @@
 p4c-out/*/tofino
+p4c-out/**/graphs
diff --git a/pipelines/fabric/src/main/resources/Makefile b/pipelines/fabric/src/main/resources/Makefile
index 81617a1..4daca72 100644
--- a/pipelines/fabric/src/main/resources/Makefile
+++ b/pipelines/fabric/src/main/resources/Makefile
@@ -13,7 +13,8 @@
 	@./bmv2-compile.sh "fabric-spgw-int" "-DWITH_SPGW -DWITH_INT_SOURCE -DWITH_INT_TRANSIT"
 
 fabric-full:
-	@./bmv2-compile.sh "fabric-full" "-DWITH_MULTICAST -DWITH_IPV6 -DWITH_SPGW \
+	@./bmv2-compile.sh "fabric-full" " -DWITH_MULTICAST -DWITH_IPV6 \
+		-DWITH_SIMPLE_NEXT -DWITH_HASHED_NEXT -DWITH_SPGW \
 		-DWITH_INT_SOURCE -DWITH_INT_TRANSIT -DWITH_INT_SINK"
 
 constants:
diff --git a/pipelines/fabric/src/main/resources/bmv2-compile.sh b/pipelines/fabric/src/main/resources/bmv2-compile.sh
index 0fede1c..a249aa0 100755
--- a/pipelines/fabric/src/main/resources/bmv2-compile.sh
+++ b/pipelines/fabric/src/main/resources/bmv2-compile.sh
@@ -1,22 +1,30 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
 BMV2_CPU_PORT="255"
 BMV2_PP_FLAGS="-DTARGET_BMV2 -DCPU_PORT=${BMV2_CPU_PORT} -DWITH_PORT_COUNTER"
 
 PROFILE=$1
 OTHER_PP_FLAGS=$2
-
 OUT_DIR=./p4c-out/${PROFILE}/bmv2/default
 
-mkdir -p ${OUT_DIR}
 
-p4c-bm2-ss --arch v1model \
+mkdir -p ${OUT_DIR}
+mkdir -p ${OUT_DIR}/graphs
+
+echo
+echo "## Compiling profile ${PROFILE} in ${OUT_DIR}..."
+(set -x; p4c-bm2-ss --arch v1model \
         -o ${OUT_DIR}/bmv2.json \
         ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} \
         --p4runtime-file ${OUT_DIR}/p4info.txt \
         --p4runtime-format text \
-        fabric.p4
+        fabric.p4)
+(set -x; p4c-graphs ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} --graphs-dir ${OUT_DIR}/graphs fabric.p4)
+for f in ${OUT_DIR}/graphs/*.dot; do
+    (set -x; dot -Tpdf ${f} > ${f}.pdf)
+    rm -f ${f}
+done
 
-echo ${BMV2_CPU_PORT} > ${OUT_DIR}/cpu_port.txt
+(set -x; echo ${BMV2_CPU_PORT} > ${OUT_DIR}/cpu_port.txt)
diff --git a/pipelines/fabric/src/main/resources/fabric.p4 b/pipelines/fabric/src/main/resources/fabric.p4
index 95b9bc8..6c60d52 100644
--- a/pipelines/fabric/src/main/resources/fabric.p4
+++ b/pipelines/fabric/src/main/resources/fabric.p4
@@ -19,6 +19,7 @@
 
 #include "include/control/filtering.p4"
 #include "include/control/forwarding.p4"
+#include "include/control/acl.p4"
 #include "include/control/next.p4"
 #include "include/control/packetio.p4"
 #include "include/header.p4"
@@ -37,13 +38,14 @@
 #include "include/int/int_main.p4"
 #endif // WITH_INT
 
-control FabricIngress (
-inout parsed_headers_t hdr,
-inout fabric_metadata_t fabric_metadata,
-inout standard_metadata_t standard_metadata) {
+control FabricIngress (inout parsed_headers_t hdr,
+                       inout fabric_metadata_t fabric_metadata,
+                       inout standard_metadata_t standard_metadata) {
+
     PacketIoIngress() pkt_io_ingress;
     Filtering() filtering;
     Forwarding() forwarding;
+    Acl() acl;
     Next() next;
 #ifdef WITH_PORT_COUNTER
     PortCountersControl() port_counters_control;
@@ -56,30 +58,33 @@
                               hdr.ipv4, hdr.udp, hdr.inner_ipv4, hdr.inner_udp);
 #endif // WITH_SPGW
         pkt_io_ingress.apply(hdr, fabric_metadata, standard_metadata);
-#ifdef WITH_SPGW
-#ifdef WITH_SPGW_PCC_GATING
-        fabric_metadata.spgw.l4_src_port = fabric_metadata.l4_src_port;
-        fabric_metadata.spgw.l4_dst_port = fabric_metadata.l4_dst_port;
-#endif // WITH_SPGW_PCC_GATING
-        spgw_ingress.apply(hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,
-                           hdr.ipv4, hdr.udp, fabric_metadata.spgw);
-#endif // WITH_SPGW
         filtering.apply(hdr, fabric_metadata, standard_metadata);
-        forwarding.apply(hdr, fabric_metadata, standard_metadata);
-        next.apply(hdr, fabric_metadata, standard_metadata);
+#ifdef WITH_SPGW
+        spgw_ingress.apply(hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,
+                           hdr.ipv4, hdr.udp, fabric_metadata);
+#endif // WITH_SPGW
+        if (fabric_metadata.skip_forwarding == _FALSE) {
+            forwarding.apply(hdr, fabric_metadata, standard_metadata);
+        }
+        acl.apply(hdr, fabric_metadata, standard_metadata);
+        if (fabric_metadata.skip_next == _FALSE) {
+            next.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_PORT_COUNTER
-        // FIXME: we're not counting pkts punted to cpu or forwarded via multicast groups.
-        port_counters_control.apply(hdr, fabric_metadata, standard_metadata);
+            // FIXME: we're not counting pkts punted to cpu or forwarded via
+            // multicast groups. Remove when gNMI support will be there.
+            port_counters_control.apply(hdr, fabric_metadata, standard_metadata);
 #endif // WITH_PORT_COUNTER
 #if defined(WITH_INT_SOURCE) || defined(WITH_INT_SINK)
-        process_set_source_sink.apply(hdr, fabric_metadata, standard_metadata);
+            process_set_source_sink.apply(hdr, fabric_metadata, standard_metadata);
 #endif
+        }
     }
 }
 
 control FabricEgress (inout parsed_headers_t hdr,
                       inout fabric_metadata_t fabric_metadata,
                       inout standard_metadata_t standard_metadata) {
+
     PacketIoEgress() pkt_io_egress;
     EgressNextControl() egress_next;
 
@@ -89,7 +94,7 @@
         egress_next.apply(hdr, fabric_metadata, standard_metadata);
 #ifdef WITH_SPGW
         spgw_egress.apply(hdr.ipv4, hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,
-                          fabric_metadata.spgw, standard_metadata);
+                          fabric_metadata, standard_metadata);
 #endif // WITH_SPGW
 #ifdef WITH_INT
         process_int_main.apply(hdr, fabric_metadata, standard_metadata);
diff --git a/pipelines/fabric/src/main/resources/include/action.p4 b/pipelines/fabric/src/main/resources/include/action.p4
deleted file mode 100644
index dc7b99e..0000000
--- a/pipelines/fabric/src/main/resources/include/action.p4
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __ACTION__
-#define __ACTION__
-#include "header.p4"
-action nop() {
-}
-
-action drop_now() {
-    mark_to_drop();
-    exit;
-}
-#endif
diff --git a/pipelines/fabric/src/main/resources/include/control/acl.p4 b/pipelines/fabric/src/main/resources/include/control/acl.p4
new file mode 100644
index 0000000..9eece9a
--- /dev/null
+++ b/pipelines/fabric/src/main/resources/include/control/acl.p4
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <core.p4>
+#include <v1model.p4>
+
+#include "../define.p4"
+#include "../header.p4"
+
+control Acl (inout parsed_headers_t hdr,
+             inout fabric_metadata_t fabric_metadata,
+             inout standard_metadata_t standard_metadata) {
+
+    /*
+     * ACL Table.
+     */
+    direct_counter(CounterType.packets_and_bytes) acl_counter;
+
+    action set_next_id_acl(next_id_t next_id) {
+        fabric_metadata.next_id = next_id;
+        acl_counter.count();
+    }
+
+    // Send immendiatelly to CPU - skip the rest of ingress.
+    action punt_to_cpu() {
+        standard_metadata.egress_spec = CPU_PORT;
+        fabric_metadata.skip_next = _TRUE;
+        acl_counter.count();
+    }
+
+    action clone_to_cpu() {
+        // FIXME: works only if pkt will be replicated via PRE multicast group.
+        fabric_metadata.clone_to_cpu = _TRUE;
+        acl_counter.count();
+    }
+
+    action drop() {
+        mark_to_drop();
+        fabric_metadata.skip_next = _TRUE;
+        acl_counter.count();
+    }
+
+    action nop_acl() {
+        acl_counter.count();
+    }
+
+    table acl {
+        key = {
+            standard_metadata.ingress_port: ternary @name("ig_port"); // 9
+            fabric_metadata.ip_proto: ternary @name("ip_proto"); // 8
+            fabric_metadata.l4_sport: ternary @name("l4_sport"); // 16
+            fabric_metadata.l4_dport: ternary @name("l4_dport"); // 16
+            hdr.ethernet.dst_addr: ternary @name("eth_src"); // 48
+            hdr.ethernet.src_addr: ternary @name("eth_dst"); // 48
+            hdr.vlan_tag.vlan_id: ternary @name("vlan_id"); // 12
+            fabric_metadata.eth_type: ternary @name("eth_type"); //16
+            hdr.ipv4.src_addr: ternary @name("ipv4_src"); // 32
+            hdr.ipv4.dst_addr: ternary @name("ipv4_dst"); // 32
+            hdr.icmp.icmp_type: ternary @name("icmp_type"); // 8
+            hdr.icmp.icmp_code: ternary @name("icmp_code"); // 8
+        }
+
+        actions = {
+            set_next_id_acl;
+            punt_to_cpu;
+            clone_to_cpu;
+            drop;
+            nop_acl;
+        }
+
+        const default_action = nop_acl();
+        size = 128;
+        counters = acl_counter;
+    }
+
+    apply {
+        acl.apply();
+    }
+}
diff --git a/pipelines/fabric/src/main/resources/include/control/filtering.p4 b/pipelines/fabric/src/main/resources/include/control/filtering.p4
index 3c5bfcb..638d9a1 100644
--- a/pipelines/fabric/src/main/resources/include/control/filtering.p4
+++ b/pipelines/fabric/src/main/resources/include/control/filtering.p4
@@ -18,80 +18,63 @@
 #include <v1model.p4>
 
 #include "../header.p4"
-#include "../action.p4"
 
-control Filtering (
-    inout parsed_headers_t hdr,
-    inout fabric_metadata_t fabric_metadata,
-    inout standard_metadata_t standard_metadata) {
+control Filtering (inout parsed_headers_t hdr,
+                   inout fabric_metadata_t fabric_metadata,
+                   inout standard_metadata_t standard_metadata) {
 
     /*
      * Ingress Port VLAN Table.
-     * Process packets for different interfaces (Port number + VLAN).
-     * For example, an untagged packet will be tagged when it entered to an
-     * interface with untagged VLAN configuration.
+     *
+     * Filter packets based on ingress port and VLAN tag.
      */
     direct_counter(CounterType.packets_and_bytes) ingress_port_vlan_counter;
 
-    action drop() {
-        mark_to_drop();
+    action deny() {
+        // Packet from unconfigured port. Skip forwarding and next block.
+        // Do ACL table in case we want to punt to cpu.
+        fabric_metadata.skip_forwarding = _TRUE;
+        fabric_metadata.skip_next = _TRUE;
         ingress_port_vlan_counter.count();
     }
 
-    action set_vlan(vlan_id_t new_vlan_id) {
-        hdr.vlan_tag.vlan_id = new_vlan_id;
+    action permit() {
+        // Allow packet as is.
         ingress_port_vlan_counter.count();
     }
 
-    action push_internal_vlan(vlan_id_t new_vlan_id) {
-        // Add internal VLAN header, will be removed before packet emission.
-        // cfi and pri values are dummy.
-        hdr.vlan_tag.setValid();
-        hdr.vlan_tag.cfi = 0;
-        hdr.vlan_tag.pri = 0;
-        hdr.vlan_tag.ether_type = hdr.ethernet.ether_type;
-        hdr.ethernet.ether_type = ETHERTYPE_VLAN;
-        hdr.vlan_tag.vlan_id = new_vlan_id;
-
-        // pop internal vlan before packet in
-        fabric_metadata.pop_vlan_when_packet_in = _TRUE;
-        ingress_port_vlan_counter.count();
-    }
-
-    action nop_ingress_port_vlan() {
-        nop();
+    action permit_with_internal_vlan(vlan_id_t vlan_id) {
+        fabric_metadata.vlan_id = vlan_id;
         ingress_port_vlan_counter.count();
     }
 
     table ingress_port_vlan {
         key = {
-            standard_metadata.ingress_port: exact;
-            hdr.vlan_tag.isValid(): exact @name("hdr.vlan_tag.is_valid");
-            hdr.vlan_tag.vlan_id: ternary;
+            standard_metadata.ingress_port: exact @name("ig_port");
+            hdr.vlan_tag.isValid(): exact @name("vlan_is_valid");
+            hdr.vlan_tag.vlan_id: ternary @name("vlan_id");
         }
-
         actions = {
-            push_internal_vlan;
-            set_vlan;
-            drop;
-            nop_ingress_port_vlan();
+            deny();
+            permit();
+            permit_with_internal_vlan();
         }
-
-        const default_action = push_internal_vlan(DEFAULT_VLAN_ID);
+        const default_action = deny();
         counters = ingress_port_vlan_counter;
     }
 
     /*
      * Forwarding Classifier.
-     * Setup Forwarding Type metadata for Forwarding control block.
+     *
+     * Set which type of forwarding behavior to execute in the next control block.
      * There are six types of tables in Forwarding control block:
      * - Bridging: default forwarding type
      * - MPLS: destination mac address is the router mac and ethernet type is
-     *         MPLS(0x8847)
+     *   MPLS(0x8847)
      * - IP Multicast: destination mac address is multicast address and ethernet
-     *                 type is IP(0x0800 or 0x86dd)
+     *   type is IP(0x0800 or 0x86dd)
      * - IP Unicast: destination mac address is router mac and ethernet type is
-     *               IP(0x0800 or 0x86dd)
+     *   IP(0x0800 or 0x86dd)
      */
     direct_counter(CounterType.packets_and_bytes) fwd_classifier_counter;
 
@@ -102,26 +85,35 @@
 
     table fwd_classifier {
         key = {
-            standard_metadata.ingress_port: exact;
-            hdr.ethernet.dst_addr: ternary;
-            hdr.vlan_tag.ether_type: exact;
+            standard_metadata.ingress_port: exact @name("ig_port");
+            hdr.ethernet.dst_addr: ternary @name("eth_dst");
+            fabric_metadata.eth_type: exact @name("eth_type");
         }
-
         actions = {
             set_forwarding_type;
         }
-
         const default_action = set_forwarding_type(FWD_BRIDGING);
         counters = fwd_classifier_counter;
     }
 
     apply {
-        if (ingress_port_vlan.apply().hit) {
-            fwd_classifier.apply();
-        } else {
-            // Packet from unconfigured port. Skip forwarding processing,
-            // except for ACL table in case we want to punt to cpu.
-            fabric_metadata.fwd_type = FWD_UNKNOWN;
+        // Initialize lookup metadata. Packets without a VLAN header will be
+        // treated as belonging to a default VLAN ID (see parser).
+        if (hdr.vlan_tag.isValid()) {
+            fabric_metadata.eth_type = hdr.vlan_tag.eth_type;
+            fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id;
+            fabric_metadata.vlan_pri = hdr.vlan_tag.pri;
+            fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi;
         }
+        if (!hdr.mpls.isValid()) {
+            // Packets with a valid MPLS header will have
+            // fabric_metadata.mpls_ttl set to the packet's MPLS ttl value (see
+            // parser). In any case, if we are forwarding via MPLS, ttl will be
+            // decremented in egress.
+            fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1;
+        }
+
+        ingress_port_vlan.apply();
+        fwd_classifier.apply();
     }
 }
diff --git a/pipelines/fabric/src/main/resources/include/control/forwarding.p4 b/pipelines/fabric/src/main/resources/include/control/forwarding.p4
index 7c69092..e5f89cb 100644
--- a/pipelines/fabric/src/main/resources/include/control/forwarding.p4
+++ b/pipelines/fabric/src/main/resources/include/control/forwarding.p4
@@ -19,68 +19,70 @@
 
 #include "../define.p4"
 #include "../header.p4"
-#include "../action.p4"
 
 
-control Forwarding (
-    inout parsed_headers_t hdr,
-    inout fabric_metadata_t fabric_metadata,
-    inout standard_metadata_t standard_metadata) {
+control Forwarding (inout parsed_headers_t hdr,
+                    inout fabric_metadata_t fabric_metadata,
+                    inout standard_metadata_t standard_metadata) {
+
+    @hidden
+    action set_next_id(next_id_t next_id) {
+        fabric_metadata.next_id = next_id;
+    }
 
     /*
      * Bridging Table.
-     * Matches destination mac address and VLAN Id and make egress decision.
      */
     direct_counter(CounterType.packets_and_bytes) bridging_counter;
 
     action set_next_id_bridging(next_id_t next_id) {
-        fabric_metadata.next_id = next_id;
+        set_next_id(next_id);
         bridging_counter.count();
     }
 
     table bridging {
         key = {
-            hdr.vlan_tag.vlan_id: exact;
-            hdr.ethernet.dst_addr: ternary;
+            fabric_metadata.vlan_id: exact @name("vlan_id");
+            hdr.ethernet.dst_addr: ternary @name("eth_dst");
         }
-
         actions = {
             set_next_id_bridging;
+            @defaultonly nop;
         }
+        const default_action = nop();
         counters = bridging_counter;
     }
 
     /*
      * MPLS Table.
-     * Matches MPLS label and make egress decision.
      */
     direct_counter(CounterType.packets_and_bytes) mpls_counter;
 
     action pop_mpls_and_next(next_id_t next_id) {
-        hdr.mpls.setInvalid();
-        fabric_metadata.next_id = next_id;
+        fabric_metadata.mpls_label = 0;
+        set_next_id(next_id);
         mpls_counter.count();
     }
 
     table mpls {
         key = {
-            hdr.mpls.label: exact;
+            fabric_metadata.mpls_label: exact @name("mpls_label");
         }
-
         actions = {
             pop_mpls_and_next;
+            @defaultonly nop;
         }
+        const default_action = nop();
         counters = mpls_counter;
     }
 
     /*
      * IPv4 Routing Table.
-     * Matches IPv4 prefix and make egress decision.
      */
     direct_counter(CounterType.packets_and_bytes) routing_v4_counter;
 
     action set_next_id_routing_v4(next_id_t next_id) {
-        fabric_metadata.next_id = next_id;
+        set_next_id(next_id);
         routing_v4_counter.count();
     }
 
@@ -90,115 +92,47 @@
 
     table routing_v4 {
         key = {
-            hdr.ipv4.dst_addr: lpm;
+            hdr.ipv4.dst_addr: lpm @name("ipv4_dst");
         }
-
         actions = {
             set_next_id_routing_v4;
             nop_routing_v4;
+            @defaultonly nop;
         }
+        const default_action = nop();
         counters = routing_v4_counter;
     }
 
-    /*
-     * ACL Table.
-     * Make final egress decision based on general metch fields.
-     */
-    direct_counter(CounterType.packets_and_bytes) acl_counter;
-
-    action set_next_id_acl(next_id_t next_id) {
-        fabric_metadata.next_id = next_id;
-        acl_counter.count();
-    }
-
-    // Send immendiatelly to CPU - skip the rest of pipeline.
-    action punt_to_cpu() {
-        standard_metadata.egress_spec = CPU_PORT;
-        acl_counter.count();
-        exit;
-    }
-
-    action clone_to_cpu() {
-        // FIXME: works only if pkt will be replicated via PRE multicast group.
-        fabric_metadata.clone_to_cpu = _TRUE;
-        acl_counter.count();
-    }
-
-    action drop() {
-        mark_to_drop();
-        acl_counter.count();
-    }
-
-    action nop_acl() {
-        acl_counter.count();
-    }
-
-    table acl {
-        key = {
-            standard_metadata.ingress_port: ternary; // 9
-            fabric_metadata.ip_proto: ternary; // 8
-            fabric_metadata.l4_src_port: ternary; // 16
-            fabric_metadata.l4_dst_port: ternary; // 16
-
-            hdr.ethernet.dst_addr: ternary; // 48
-            hdr.ethernet.src_addr: ternary; // 48
-            hdr.vlan_tag.vlan_id: ternary; // 12
-            hdr.vlan_tag.ether_type: ternary; //16
-            hdr.ipv4.src_addr: ternary; // 32
-            hdr.ipv4.dst_addr: ternary; // 32
-            hdr.icmp.icmp_type: ternary; // 8
-            hdr.icmp.icmp_code: ternary; // 8
-        }
-
-        actions = {
-            set_next_id_acl;
-            punt_to_cpu;
-            clone_to_cpu;
-            drop;
-            nop_acl;
-        }
-
-        const default_action = nop_acl();
-        size = 128;
-        counters = acl_counter;
-    }
-
 #ifdef WITH_IPV6
     /*
      * IPv6 Routing Table.
-     * Matches IPv6 prefix and make egress decision.
      */
     direct_counter(CounterType.packets_and_bytes) routing_v6_counter;
 
     action set_next_id_routing_v6(next_id_t next_id) {
-        fabric_metadata.next_id = next_id;
+        set_next_id(next_id);
         routing_v6_counter.count();
     }
 
     table routing_v6 {
         key = {
-            hdr.ipv6.dst_addr: lpm;
+            hdr.ipv6.dst_addr: lpm @name("ipv6_dst");
         }
-
         actions = {
             set_next_id_routing_v6;
+            @defaultonly nop;
         }
+        const default_action = nop();
         counters = routing_v6_counter;
     }
 #endif // WITH_IPV6
 
     apply {
-        if(fabric_metadata.fwd_type == FWD_BRIDGING) bridging.apply();
-        else if (fabric_metadata.fwd_type == FWD_MPLS) {
-            mpls.apply();
-
-            // TODO: IPv6
-            hdr.vlan_tag.ether_type = ETHERTYPE_IPV4;
-        }
+        if (fabric_metadata.fwd_type == FWD_BRIDGING) bridging.apply();
+        else if (fabric_metadata.fwd_type == FWD_MPLS) mpls.apply();
         else if (fabric_metadata.fwd_type == FWD_IPV4_UNICAST) routing_v4.apply();
 #ifdef WITH_IPV6
         else if (fabric_metadata.fwd_type == FWD_IPV6_UNICAST) routing_v6.apply();
 #endif // WITH_IPV6
-        acl.apply();
     }
 }
diff --git a/pipelines/fabric/src/main/resources/include/control/next.p4 b/pipelines/fabric/src/main/resources/include/control/next.p4
index 69e622b..98b3812 100644
--- a/pipelines/fabric/src/main/resources/include/control/next.p4
+++ b/pipelines/fabric/src/main/resources/include/control/next.p4
@@ -18,63 +18,104 @@
 #include <v1model.p4>
 
 #include "../header.p4"
-#include "../action.p4"
 
-control Next (
-    inout parsed_headers_t hdr,
-    inout fabric_metadata_t fabric_metadata,
-    inout standard_metadata_t standard_metadata) {
+control Next (inout parsed_headers_t hdr,
+              inout fabric_metadata_t fabric_metadata,
+              inout standard_metadata_t standard_metadata) {
 
     /*
      * General actions.
      */
-    action pop_vlan() {
-        hdr.ethernet.ether_type = hdr.vlan_tag.ether_type;
-        hdr.vlan_tag.setInvalid();
+    @hidden
+    action output(port_num_t port_num) {
+     standard_metadata.egress_spec = port_num;
     }
 
+    @hidden
     action rewrite_smac(mac_addr_t smac) {
         hdr.ethernet.src_addr = smac;
     }
 
+    @hidden
     action rewrite_dmac(mac_addr_t dmac) {
         hdr.ethernet.dst_addr = dmac;
     }
 
-    action push_mpls (mpls_label_t label, bit<3> tc) {
-        // Suppose that the maximum number of label is one.
-        hdr.mpls.setValid();
-        hdr.vlan_tag.ether_type = ETHERTYPE_MPLS;
-        hdr.mpls.label = label;
-        hdr.mpls.tc = tc;
-        hdr.mpls.bos = 1w1; // BOS = TRUE
-        hdr.mpls.ttl = DEFAULT_MPLS_TTL;
+    @hidden
+    action set_mpls_label(mpls_label_t label) {
+        fabric_metadata.mpls_label = label;
+    }
+
+    @hidden
+    action routing(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
+        rewrite_smac(smac);
+        rewrite_dmac(dmac);
+        output(port_num);
+    }
+
+    @hidden
+    action mpls_routing(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
+                        mpls_label_t label) {
+        set_mpls_label(label);
+        routing(port_num, smac, dmac);
     }
 
     /*
-     * VLAN Metadata Table.
-     * Modify VLAN Id according to metadata from NextObjective(next id).
+     * Next VLAN table.
+     * Modify VLAN ID based on next ID.
      */
-    direct_counter(CounterType.packets_and_bytes) vlan_meta_counter;
+    direct_counter(CounterType.packets_and_bytes) next_vlan_counter;
 
-    action set_vlan(vlan_id_t new_vlan_id) {
-        hdr.vlan_tag.vlan_id = new_vlan_id;
-        vlan_meta_counter.count();
+    action set_vlan(vlan_id_t vlan_id) {
+        fabric_metadata.vlan_id = vlan_id;
+        next_vlan_counter.count();
     }
 
-    table vlan_meta {
+    table next_vlan {
         key = {
-            fabric_metadata.next_id: exact;
+            fabric_metadata.next_id: exact @name("next_id");
         }
-
         actions = {
             set_vlan;
             @defaultonly nop;
         }
-        default_action = nop;
-        counters = vlan_meta_counter;
+        const default_action = nop();
+        counters = next_vlan_counter;
     }
 
+#ifdef WITH_XCONNECT
+    /*
+     * Cross-connect table.
+     * Bidirectional forwarding for the same next id.
+     */
+    direct_counter(CounterType.packets_and_bytes) xconnect_counter;
+
+    action output_xconnect(port_num_t port_num) {
+        output(port_num);
+        xconnect_counter.count();
+    }
+
+    action set_next_id_xconnect(next_id_t next_id) {
+        fabric_metadata.next_id = next_id;
+        xconnect_counter.count();
+    }
+
+    table xconnect {
+        key = {
+            standard_metadata.ingress_port: exact @name("ig_port");
+            fabric_metadata.next_id: exact @name("next_id");
+        }
+        actions = {
+            output_xconnect;
+            set_next_id_xconnect;
+            @defaultonly nop;
+        }
+        counters = xconnect_counter;
+        const default_action = nop();
+    }
+#endif // WITH_XCONNECT
+
+#ifdef WITH_SIMPLE_NEXT
     /*
      * Simple Table.
      * Do a single egress action based on next id.
@@ -82,197 +123,212 @@
     direct_counter(CounterType.packets_and_bytes) simple_counter;
 
     action output_simple(port_num_t port_num) {
-        standard_metadata.egress_spec = port_num;
+        output(port_num);
         simple_counter.count();
     }
 
-    action set_vlan_output(vlan_id_t new_vlan_id, port_num_t port_num){
-        hdr.vlan_tag.vlan_id = new_vlan_id;
-        output_simple(port_num);
+    action routing_simple(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
+        routing(port_num, smac, dmac);
+        simple_counter.count();
     }
 
-    action l3_routing_simple(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
-        rewrite_smac(smac);
-        rewrite_dmac(dmac);
-        output_simple(port_num);
-    }
-
-    action mpls_routing_v4_simple(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
-                            mpls_label_t label) {
-        l3_routing_simple(port_num, smac, dmac);
-
-        // TODO: set tc according to diffserv from ipv4
-        push_mpls(label, 3w0);
-    }
-
-    action mpls_routing_v6_simple (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
-                            mpls_label_t label) {
-        l3_routing_simple(port_num, smac, dmac);
-
-        // TODO: set tc according to traffic_class from ipv4
-        push_mpls(label, 3w0);
-    }
-
-    action l3_routing_vlan(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac, vlan_id_t new_vlan_id) {
-        rewrite_smac(smac);
-        rewrite_dmac(dmac);
-        set_vlan_output(new_vlan_id, port_num);
+    action mpls_routing_simple(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
+                               mpls_label_t label) {
+        mpls_routing(port_num, smac, dmac, label);
+        simple_counter.count();
     }
 
     table simple {
         key = {
-            fabric_metadata.next_id: exact;
+            fabric_metadata.next_id: exact @name("next_id");
         }
-
         actions = {
             output_simple;
-            set_vlan_output;
-            l3_routing_simple;
-            mpls_routing_v4_simple;
-            mpls_routing_v6_simple;
-            l3_routing_vlan;
+            routing_simple;
+            mpls_routing_simple;
+            @defaultonly nop;
         }
+        const default_action = nop();
         counters = simple_counter;
     }
+#endif // WITH_SIMPLE_NEXT
 
+#ifdef WITH_HASHED_NEXT
     /*
      * Hashed table.
-     * Execute an action profile group based on next id.
-     * One action profile group may contains multple egress decision.
-     * The execution picks one action profile group memebr by using 5-tuple
-     * hashing.
+     * Execute an action profile selector based on next id.
      */
-    action_selector(HashAlgorithm.crc16, 32w64, 32w16) ecmp_selector;
+    action_selector(HashAlgorithm.crc16, 32w64, 32w16) hashed_selector;
     direct_counter(CounterType.packets_and_bytes) hashed_counter;
 
     action output_hashed(port_num_t port_num) {
-        standard_metadata.egress_spec = port_num;
+        output(port_num);
         hashed_counter.count();
     }
 
-    action l3_routing_hashed(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
-        rewrite_smac(smac);
-        rewrite_dmac(dmac);
-        output_hashed(port_num);
+    action routing_hashed(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
+        routing(port_num, smac, dmac);
+        hashed_counter.count();
     }
 
-    action mpls_routing_v4_hashed (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
-                            mpls_label_t label) {
-        l3_routing_hashed(port_num, smac, dmac);
-
-        // TODO: set tc according to diffserv from ipv4
-        push_mpls(label, 3w0);
-    }
-
-    action mpls_routing_v6_hashed (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
-                            mpls_label_t label) {
-        l3_routing_hashed(port_num, smac, dmac);
-
-        // TODO: set tc according to traffic_class from ipv4
-        push_mpls(label, 3w0);
+    action mpls_routing_hashed(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
+                               mpls_label_t label) {
+        mpls_routing(port_num, smac, dmac, label);
+        hashed_counter.count();
     }
 
     table hashed {
         key = {
-            fabric_metadata.next_id: exact;
+            fabric_metadata.next_id: exact @name("next_id");
             hdr.ipv4.dst_addr: selector;
             hdr.ipv4.src_addr: selector;
             fabric_metadata.ip_proto: selector;
-            fabric_metadata.l4_src_port: selector;
-            fabric_metadata.l4_dst_port: selector;
+            fabric_metadata.l4_sport: selector;
+            fabric_metadata.l4_dport: selector;
         }
-
         actions = {
-            l3_routing_hashed;
-            mpls_routing_v4_hashed;
-            mpls_routing_v6_hashed;
+            output_hashed;
+            routing_hashed;
+            mpls_routing_hashed;
+            @defaultonly nop;
         }
-
-        implementation = ecmp_selector;
+        implementation = hashed_selector;
         counters = hashed_counter;
+        const default_action = nop();
     }
+#endif // WITH_HASHED_NEXT
 
     /*
-     * Multicast Table.
-     * Setup multicast group id for packet replication engine (PRE).
+     * Multicast
+     * Maps next IDs to PRE multicat group IDs.
      */
     direct_counter(CounterType.packets_and_bytes) multicast_counter;
 
-    action set_mcast_group(group_id_t gid) {
-        standard_metadata.mcast_grp = gid;
+    action set_mcast_group_id(mcast_group_id_t group_id) {
+        standard_metadata.mcast_grp = group_id;
         fabric_metadata.is_multicast = _TRUE;
         multicast_counter.count();
     }
 
     table multicast {
         key = {
-            fabric_metadata.next_id: exact;
+            fabric_metadata.next_id: exact @name("next_id");
         }
         actions = {
-            set_mcast_group;
+            set_mcast_group_id;
+            @defaultonly nop;
         }
         counters = multicast_counter;
+        const default_action = nop();
     }
 
     apply {
-        vlan_meta.apply();
-        if (!simple.apply().hit) {
-            if (!hashed.apply().hit) {
-                if (!multicast.apply().hit) {
-                    // Next ID doesn't match any table.
-                    return;
-                }
-            }
-        }
-        // Decrement TTL
-        if (!hdr.mpls.isValid()) {
-            if(hdr.ipv4.isValid()) {
-                hdr.ipv4.ttl = hdr.ipv4.ttl - 1;
-            }
-#ifdef WITH_IPV6
-            else if (hdr.ipv6.isValid()) {
-                hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1;
-            }
-#endif // WITH_IPV6
-        }
+#ifdef WITH_XCONNECT
+        // xconnect might set a new next_id.
+        xconnect.apply();
+#endif // WITH_XCONNECT
+#ifdef WITH_SIMPLE_NEXT
+        simple.apply();
+#endif // WITH_SIMPLE_NEXT
+#ifdef WITH_HASHED_NEXT
+        hashed.apply();
+#endif // WITH_HASHED_NEXT
+        multicast.apply();
+        next_vlan.apply();
     }
 }
 
-control EgressNextControl (
-    inout parsed_headers_t hdr,
-    inout fabric_metadata_t fabric_metadata,
-    inout standard_metadata_t standard_metadata) {
+control EgressNextControl (inout parsed_headers_t hdr,
+                           inout fabric_metadata_t fabric_metadata,
+                           inout standard_metadata_t standard_metadata) {
+    @hidden
+    action pop_mpls_if_present() {
+        hdr.mpls.setInvalid();
+        // Assuming there's an IP header after the MPLS one.
+        fabric_metadata.eth_type = fabric_metadata.ip_eth_type;
+    }
+
+    @hidden
+    action set_mpls() {
+        hdr.mpls.setValid();
+        hdr.mpls.label = fabric_metadata.mpls_label;
+        hdr.mpls.tc = 3w0;
+        hdr.mpls.bos = 1w1; // BOS = TRUE
+        hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push.
+        fabric_metadata.eth_type = ETHERTYPE_MPLS;
+    }
+
+    @hidden
+    action push_vlan() {
+        // If VLAN is already valid, we overwrite it with a potentially new VLAN
+        // ID, and same CFI, PRI, and eth_type values found in ingress.
+        hdr.vlan_tag.setValid();
+        hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi;
+        hdr.vlan_tag.pri = fabric_metadata.vlan_pri;
+        hdr.vlan_tag.eth_type = fabric_metadata.eth_type;
+        hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id;
+        hdr.ethernet.eth_type = ETHERTYPE_VLAN;
+    }
 
     /*
      * Egress VLAN Table.
-     * Pops VLAN tag according to interface(Port and VLAN) configuration.
+     * Pops the VLAN tag if the pair egress port and VLAN ID is matched.
      */
     direct_counter(CounterType.packets_and_bytes) egress_vlan_counter;
 
     action pop_vlan() {
-        hdr.ethernet.ether_type = hdr.vlan_tag.ether_type;
+        hdr.ethernet.eth_type = fabric_metadata.eth_type;
         hdr.vlan_tag.setInvalid();
         egress_vlan_counter.count();
     }
 
     table egress_vlan {
         key = {
-            hdr.vlan_tag.vlan_id: exact;
-            standard_metadata.egress_port: exact;
+            fabric_metadata.vlan_id: exact @name("vlan_id");
+            standard_metadata.egress_port: exact @name("eg_port");
         }
         actions = {
             pop_vlan;
             @defaultonly nop;
         }
-        default_action = nop;
+        const default_action = nop();
         counters = egress_vlan_counter;
     }
 
     apply {
         if (fabric_metadata.is_multicast == _TRUE
              && standard_metadata.ingress_port == standard_metadata.egress_port) {
-            drop_now();
+            mark_to_drop();
         }
-        egress_vlan.apply();
+
+        if (fabric_metadata.mpls_label == 0) {
+            if (hdr.mpls.isValid()) pop_mpls_if_present();
+        } else {
+            set_mpls();
+        }
+
+        if (!egress_vlan.apply().hit) {
+            // Push VLAN tag if not the default one.
+            if (fabric_metadata.vlan_id != DEFAULT_VLAN_ID) {
+                push_vlan();
+            }
+        }
+
+        // TTL decrement and check.
+        if (hdr.mpls.isValid()) {
+            hdr.mpls.ttl = hdr.mpls.ttl - 1;
+            if (hdr.mpls.ttl == 0) mark_to_drop();
+        } else {
+            if(hdr.ipv4.isValid()) {
+                hdr.ipv4.ttl = hdr.ipv4.ttl - 1;
+                if (hdr.ipv4.ttl == 0) mark_to_drop();
+            }
+#ifdef WITH_IPV6
+            else if (hdr.ipv6.isValid()) {
+                hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1;
+                if (hdr.ipv6.hop_limit == 0) mark_to_drop();
+            }
+#endif // WITH_IPV6
+        }
     }
 }
diff --git a/pipelines/fabric/src/main/resources/include/control/packetio.p4 b/pipelines/fabric/src/main/resources/include/control/packetio.p4
index a77d82a..a29c044 100644
--- a/pipelines/fabric/src/main/resources/include/control/packetio.p4
+++ b/pipelines/fabric/src/main/resources/include/control/packetio.p4
@@ -15,12 +15,11 @@
  */
 
 #include "../header.p4"
-#include "../action.p4"
 
-control PacketIoIngress(
-inout parsed_headers_t hdr,
-inout fabric_metadata_t fabric_metadata,
-inout standard_metadata_t standard_metadata) {
+control PacketIoIngress(inout parsed_headers_t hdr,
+                        inout fabric_metadata_t fabric_metadata,
+                        inout standard_metadata_t standard_metadata) {
+
     apply {
         if (hdr.packet_out.isValid()) {
             standard_metadata.egress_spec = hdr.packet_out.egress_port;
@@ -32,27 +31,20 @@
     }
 }
 
-control PacketIoEgress(
-        inout parsed_headers_t hdr,
-        inout fabric_metadata_t fabric_metadata,
-        inout standard_metadata_t standard_metadata) {
-    action pop_vlan() {
-        hdr.ethernet.ether_type = hdr.vlan_tag.ether_type;
-        hdr.vlan_tag.setInvalid();
-    }
+control PacketIoEgress(inout parsed_headers_t hdr,
+                       inout fabric_metadata_t fabric_metadata,
+                       inout standard_metadata_t standard_metadata) {
+
     apply {
         if (fabric_metadata.is_controller_packet_out == _TRUE) {
             // Transmit right away.
             exit;
         }
         if (standard_metadata.egress_port == CPU_PORT) {
-            if (hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == _TRUE) {
-                pop_vlan();
-            }
             if (fabric_metadata.is_multicast == _TRUE &&
                 fabric_metadata.clone_to_cpu == _FALSE) {
                 // Is multicast but clone was not requested.
-                drop_now();
+                mark_to_drop();
             }
             hdr.packet_in.setValid();
             hdr.packet_in.ingress_port = standard_metadata.ingress_port;
diff --git a/pipelines/fabric/src/main/resources/include/control/port_counter.p4 b/pipelines/fabric/src/main/resources/include/control/port_counter.p4
index 3e9ea00..a34a738 100644
--- a/pipelines/fabric/src/main/resources/include/control/port_counter.p4
+++ b/pipelines/fabric/src/main/resources/include/control/port_counter.p4
@@ -19,7 +19,10 @@
 #include "../define.p4"
 #include "../header.p4"
 
-control PortCountersControl(inout parsed_headers_t hdr, inout fabric_metadata_t fabric_metadata, inout standard_metadata_t standard_metadata) {
+control PortCountersControl(inout parsed_headers_t hdr,
+                            inout fabric_metadata_t fabric_metadata,
+                            inout standard_metadata_t standard_metadata) {
+
     counter(MAX_PORTS, CounterType.packets_and_bytes) egress_port_counter;
     counter(MAX_PORTS, CounterType.packets_and_bytes) ingress_port_counter;
 
diff --git a/pipelines/fabric/src/main/resources/include/define.p4 b/pipelines/fabric/src/main/resources/include/define.p4
index dfde323..f7a03c3 100644
--- a/pipelines/fabric/src/main/resources/include/define.p4
+++ b/pipelines/fabric/src/main/resources/include/define.p4
@@ -23,6 +23,14 @@
 #define WITH_INT
 #endif
 
+#ifndef WITHOUT_XCONNECT
+#define WITH_XCONNECT
+#endif
+
+#if ! defined(WITH_SIMPLE_NEXT)
+#define WITH_HASHED_NEXT
+#endif
+
 #ifndef _BOOL
 #define _BOOL bool
 #endif
@@ -78,7 +86,7 @@
 typedef bit<20> mpls_label_t;
 typedef bit<9>  port_num_t;
 typedef bit<48> mac_addr_t;
-typedef bit<16> group_id_t;
+typedef bit<16> mcast_group_id_t;
 typedef bit<12> vlan_id_t;
 typedef bit<32> ipv4_addr_t;
 typedef bit<16> l4_port_t;
@@ -154,4 +162,8 @@
 const bit<8> IPV4_MIN_HEAD_LEN = 20;
 const bit<8> UDP_HEADER_LEN = 8;
 
+action nop() {
+    NoAction();
+}
+
 #endif
diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4
index df29408..f57e974 100644
--- a/pipelines/fabric/src/main/resources/include/header.p4
+++ b/pipelines/fabric/src/main/resources/include/header.p4
@@ -36,14 +36,14 @@
 header ethernet_t {
     mac_addr_t dst_addr;
     mac_addr_t src_addr;
-    bit<16> ether_type;
+    bit<16> eth_type;
 }
 
 header vlan_tag_t {
     bit<3> pri;
     bit<1> cfi;
     vlan_id_t vlan_id;
-    bit<16> ether_type;
+    bit<16> eth_type;
 }
 
 header mpls_t {
@@ -80,17 +80,9 @@
     bit<128> dst_addr;
 }
 
-header arp_t {
-    bit<16> hw_type;
-    bit<16> proto_type;
-    bit<8> hw_addr_len;
-    bit<8> proto_addr_len;
-    bit<16> opcode;
-}
-
 header tcp_t {
-    bit<16> src_port;
-    bit<16> dst_port;
+    bit<16> sport;
+    bit<16> dport;
     bit<32> seq_no;
     bit<32> ack_no;
     bit<4>  data_offset;
@@ -103,8 +95,8 @@
 }
 
 header udp_t {
-    bit<16> src_port;
-    bit<16> dst_port;
+    bit<16> sport;
+    bit<16> dport;
     bit<16> len;
     bit<16> checksum;
 }
@@ -139,8 +131,8 @@
     bit<32>           s1u_enb_addr;
     bit<32>           s1u_sgw_addr;
 #ifdef WITH_SPGW_PCC_GATING
-    bit<16>           l4_src_port;
-    bit<16>           l4_dst_port;
+    bit<16>           l4_sport;
+    bit<16>           l4_dport;
     pcc_gate_status_t pcc_gate_status;
     sdf_rule_id_t     sdf_rule_id;
     pcc_rule_id_t     pcc_rule_id;
@@ -150,17 +142,25 @@
 
 //Custom metadata definition
 struct fabric_metadata_t {
-    fwd_type_t fwd_type;
-    next_id_t next_id;
-    _BOOL pop_vlan_when_packet_in;
-    _BOOL is_multicast;
-    _BOOL is_controller_packet_out;
-    _BOOL clone_to_cpu;
-    bit<8> ip_proto;
-    bit<16> l4_src_port;
-    bit<16> l4_dst_port;
+    bit<16>       eth_type;
+    bit<16>       ip_eth_type;
+    vlan_id_t     vlan_id;
+    bit<3>        vlan_pri;
+    bit<1>        vlan_cfi;
+    mpls_label_t  mpls_label;
+    bit<8>        mpls_ttl;
+    _BOOL         skip_forwarding;
+    _BOOL         skip_next;
+    fwd_type_t    fwd_type;
+    next_id_t     next_id;
+    _BOOL         is_multicast;
+    _BOOL         is_controller_packet_out;
+    _BOOL         clone_to_cpu;
+    bit<8>        ip_proto;
+    bit<16>       l4_sport;
+    bit<16>       l4_dport;
 #ifdef WITH_SPGW
-    spgw_meta_t spgw;
+    spgw_meta_t   spgw;
 #endif // WITH_SPGW
 #ifdef WITH_INT
     int_metadata_t int_meta;
@@ -170,6 +170,9 @@
 struct parsed_headers_t {
     ethernet_t ethernet;
     vlan_tag_t vlan_tag;
+#ifdef WITH_XCONNECT
+    vlan_tag_t inner_vlan_tag;
+#endif // WITH_XCONNECT
     mpls_t mpls;
 #ifdef WITH_SPGW
     ipv4_t gtpu_ipv4;
@@ -182,7 +185,6 @@
 #ifdef WITH_IPV6
     ipv6_t ipv6;
 #endif // WITH_IPV6
-    arp_t arp;
     tcp_t tcp;
     udp_t udp;
     icmp_t icmp;
diff --git a/pipelines/fabric/src/main/resources/include/int/int_main.p4 b/pipelines/fabric/src/main/resources/include/int/int_main.p4
index ef81cc9..c1368d8 100644
--- a/pipelines/fabric/src/main/resources/include/int/int_main.p4
+++ b/pipelines/fabric/src/main/resources/include/int/int_main.p4
@@ -45,11 +45,13 @@
 
     table tb_set_source {
         key = {
-            standard_metadata.ingress_port: exact;
+            standard_metadata.ingress_port: exact @name("ig_port");
         }
         actions = {
             int_set_source;
+            @defaultonly nop();
         }
+        const default_action = nop();
         counters = counter_set_source;
         size = MAX_PORTS;
     }
@@ -64,11 +66,13 @@
 
     table tb_set_sink {
         key = {
-            standard_metadata.egress_spec: exact;
+            standard_metadata.egress_spec: exact @name("eg_spec");
         }
         actions = {
             int_set_sink;
+            @defaultonly nop();
         }
+        const default_action = nop();
         counters = counter_set_sink;
         size = MAX_PORTS;
     }
diff --git a/pipelines/fabric/src/main/resources/include/int/int_report.p4 b/pipelines/fabric/src/main/resources/include/int/int_report.p4
index 9326375..8c48ba2 100644
--- a/pipelines/fabric/src/main/resources/include/int/int_report.p4
+++ b/pipelines/fabric/src/main/resources/include/int/int_report.p4
@@ -23,6 +23,7 @@
     inout fabric_metadata_t fabric_metadata,
     inout standard_metadata_t standard_metadata) {
 
+    @hidden
     action add_report_fixed_header() {
         /* Device should include its own INT metadata as embedded,
          * we'll not use fabric_report_header for this purpose.
@@ -49,7 +50,7 @@
         hdr.report_ethernet.setValid();
         hdr.report_ethernet.dst_addr = mon_mac;
         hdr.report_ethernet.src_addr = src_mac;
-        hdr.report_ethernet.ether_type = ETHERTYPE_IPV4;
+        hdr.report_ethernet.eth_type = ETHERTYPE_IPV4;
 
         //Report IPV4 Header
         hdr.report_ipv4.setValid();
@@ -71,8 +72,8 @@
 
         //Report UDP Header
         hdr.report_udp.setValid();
-        hdr.report_udp.src_port = 0;
-        hdr.report_udp.dst_port = mon_port;
+        hdr.report_udp.sport = 0;
+        hdr.report_udp.dport = mon_port;
         hdr.report_udp.len =  (bit<16>) UDP_HEADER_LEN + (bit<16>) REPORT_FIXED_HEADER_LEN +
                                     (bit<16>) ETH_HEADER_LEN + hdr.ipv4.total_len;
 
@@ -87,7 +88,9 @@
         }
         actions = {
             do_report_encapsulation;
+            @defaultonly nop();
         }
+        default_action = nop;
     }
 
     apply {
diff --git a/pipelines/fabric/src/main/resources/include/int/int_sink.p4 b/pipelines/fabric/src/main/resources/include/int/int_sink.p4
index 6c64e32..6531a17 100644
--- a/pipelines/fabric/src/main/resources/include/int/int_sink.p4
+++ b/pipelines/fabric/src/main/resources/include/int/int_sink.p4
@@ -22,11 +22,13 @@
     inout parsed_headers_t hdr,
     inout fabric_metadata_t fabric_metadata) {
 
+    @hidden
     action restore_header () {
-        hdr.udp.dst_port = hdr.intl4_tail.dest_port;
+        hdr.udp.dport = hdr.intl4_tail.dest_port;
         hdr.ipv4.dscp = hdr.intl4_tail.dscp;
     }
 
+    @hidden
     action int_sink() {
         // restore length fields of IPv4 header and UDP header
         bit<16> len_bytes = (bit<16>) (hdr.intl4_shim.len_words << 5w2);
diff --git a/pipelines/fabric/src/main/resources/include/int/int_source.p4 b/pipelines/fabric/src/main/resources/include/int/int_source.p4
index 245fe7e..93288a4 100644
--- a/pipelines/fabric/src/main/resources/include/int/int_source.p4
+++ b/pipelines/fabric/src/main/resources/include/int/int_source.p4
@@ -26,6 +26,7 @@
 
     direct_counter(CounterType.packets_and_bytes) counter_int_source;
 
+    @hidden
     action int_source(bit<8> max_hop, bit<5> ins_cnt, bit<4> ins_mask0003, bit<4> ins_mask0407) {
         // Insert INT shim header.
         hdr.intl4_shim.setValid();
@@ -49,7 +50,7 @@
         // Insert INT tail header.
         hdr.intl4_tail.setValid();
         hdr.intl4_tail.next_proto = hdr.ipv4.protocol;
-        hdr.intl4_tail.dest_port = fabric_metadata.l4_dst_port;
+        hdr.intl4_tail.dest_port = fabric_metadata.l4_dport;
         hdr.intl4_tail.dscp = hdr.ipv4.dscp;
         // Update IP and UDP (if not valid we don't care) lens (in bytes).
         hdr.ipv4.total_len = hdr.ipv4.total_len + INT_HEADER_LEN_BYTES;
@@ -64,15 +65,17 @@
 
     table tb_int_source {
         key = {
-            hdr.ipv4.src_addr: ternary;
-            hdr.ipv4.dst_addr: ternary;
-            fabric_metadata.l4_src_port: ternary;
-            fabric_metadata.l4_dst_port: ternary;
+            hdr.ipv4.src_addr: ternary @name("ipv4_src");
+            hdr.ipv4.dst_addr: ternary @name("ipv4_dst");
+            fabric_metadata.l4_sport: ternary @name("l4_sport");
+            fabric_metadata.l4_dport: ternary @name("l4_dport");
         }
         actions = {
             int_source_dscp;
+            @defaultonly nop();
         }
         counters = counter_int_source;
+        const default_action = nop();
     }
 
     apply {
diff --git a/pipelines/fabric/src/main/resources/include/int/int_transit.p4 b/pipelines/fabric/src/main/resources/include/int/int_transit.p4
index 579fa07..b524f6f 100644
--- a/pipelines/fabric/src/main/resources/include/int/int_transit.p4
+++ b/pipelines/fabric/src/main/resources/include/int/int_transit.p4
@@ -36,22 +36,26 @@
     _INT_METADATA_ACTIONS
 #else
     // Switch ID.
+    @hidden
     action int_set_header_0() {
         hdr.int_switch_id.setValid();
         hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id;
     }
     // Port IDs.
+    @hidden
     action int_set_header_1() {
         hdr.int_port_ids.setValid();
         hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port;
         hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port;
     }
     // Hop latency.
+    @hidden
     action int_set_header_2() {
         hdr.int_hop_latency.setValid();
         hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta;
     }
     // Queue occupancy.
+    @hidden
     action int_set_header_3() {
         hdr.int_q_occupancy.setValid();
         // TODO: support queues in BMv2. ATM we assume only one.
@@ -59,16 +63,19 @@
         hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth;
     }
     // Ingress timestamp.
+    @hidden
     action int_set_header_4() {
         hdr.int_ingress_tstamp.setValid();
         hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp;
     }
     // Egress timestamp.
+    @hidden
     action int_set_header_5() {
         hdr.int_egress_tstamp.setValid();
         hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta;
     }
     // Queue congestion.
+    @hidden
     action int_set_header_6() {
         hdr.int_q_congestion.setValid();
         // TODO: support queue congestion.
@@ -76,6 +83,7 @@
         hdr.int_q_congestion.q_congestion = 24w0;
     }
     // Egress port utilization.
+    @hidden
     action int_set_header_7() {
         hdr.int_egress_tx_util.setValid();
         // TODO: implement tx utilization support in BMv2.
@@ -84,21 +92,25 @@
 #endif // _INT_METADATA_ACTIONS
 
     // Actions to keep track of the new metadata added.
+    @hidden
     action add_1() {
         fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1;
         fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4;
     }
 
+    @hidden
     action add_2() {
         fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2;
         fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8;
     }
 
+    @hidden
     action add_3() {
         fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3;
         fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12;
     }
 
+    @hidden
     action add_4() {
         fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4;
         fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16;
@@ -106,78 +118,94 @@
 
     // Action function for bits 0-3 combinations, 0 is msb, 3 is lsb.
     // Each bit set indicates that corresponding INT header should be added.
+    @hidden
     action int_set_header_0003_i0() {
     }
+    @hidden
     action int_set_header_0003_i1() {
         int_set_header_3();
         add_1();
     }
+    @hidden
     action int_set_header_0003_i2() {
         int_set_header_2();
         add_1();
     }
+    @hidden
     action int_set_header_0003_i3() {
         int_set_header_3();
         int_set_header_2();
         add_2();
     }
+    @hidden
     action int_set_header_0003_i4() {
         int_set_header_1();
         add_1();
     }
+    @hidden
     action int_set_header_0003_i5() {
         int_set_header_3();
         int_set_header_1();
         add_2();
     }
+    @hidden
     action int_set_header_0003_i6() {
         int_set_header_2();
         int_set_header_1();
         add_2();
     }
+    @hidden
     action int_set_header_0003_i7() {
         int_set_header_3();
         int_set_header_2();
         int_set_header_1();
         add_3();
     }
+    @hidden
     action int_set_header_0003_i8() {
         int_set_header_0();
         add_1();
     }
+    @hidden
     action int_set_header_0003_i9() {
         int_set_header_3();
         int_set_header_0();
         add_2();
     }
+    @hidden
     action int_set_header_0003_i10() {
         int_set_header_2();
         int_set_header_0();
         add_2();
     }
+    @hidden
     action int_set_header_0003_i11() {
         int_set_header_3();
         int_set_header_2();
         int_set_header_0();
         add_3();
     }
+    @hidden
     action int_set_header_0003_i12() {
         int_set_header_1();
         int_set_header_0();
         add_2();
     }
+    @hidden
     action int_set_header_0003_i13() {
         int_set_header_3();
         int_set_header_1();
         int_set_header_0();
         add_3();
     }
+    @hidden
     action int_set_header_0003_i14() {
         int_set_header_2();
         int_set_header_1();
         int_set_header_0();
         add_3();
     }
+    @hidden
     action int_set_header_0003_i15() {
         int_set_header_3();
         int_set_header_2();
@@ -187,78 +215,94 @@
     }
 
     // Action function for bits 4-7 combinations, 4 is msb, 7 is lsb.
+    @hidden
     action int_set_header_0407_i0() {
     }
+    @hidden
     action int_set_header_0407_i1() {
         int_set_header_7();
         add_1();
     }
+    @hidden
     action int_set_header_0407_i2() {
         int_set_header_6();
         add_1();
     }
+    @hidden
     action int_set_header_0407_i3() {
         int_set_header_7();
         int_set_header_6();
         add_2();
     }
+    @hidden
     action int_set_header_0407_i4() {
         int_set_header_5();
         add_1();
     }
+    @hidden
     action int_set_header_0407_i5() {
         int_set_header_7();
         int_set_header_5();
         add_2();
     }
+    @hidden
     action int_set_header_0407_i6() {
         int_set_header_6();
         int_set_header_5();
         add_2();
     }
+    @hidden
     action int_set_header_0407_i7() {
         int_set_header_7();
         int_set_header_6();
         int_set_header_5();
         add_3();
     }
+    @hidden
     action int_set_header_0407_i8() {
         int_set_header_4();
         add_1();
     }
+    @hidden
     action int_set_header_0407_i9() {
         int_set_header_7();
         int_set_header_4();
         add_2();
     }
+    @hidden
     action int_set_header_0407_i10() {
         int_set_header_6();
         int_set_header_4();
         add_2();
     }
+    @hidden
     action int_set_header_0407_i11() {
         int_set_header_7();
         int_set_header_6();
         int_set_header_4();
         add_3();
     }
+    @hidden
     action int_set_header_0407_i12() {
         int_set_header_5();
         int_set_header_4();
         add_2();
     }
+    @hidden
     action int_set_header_0407_i13() {
         int_set_header_7();
         int_set_header_5();
         int_set_header_4();
         add_3();
     }
+    @hidden
     action int_set_header_0407_i14() {
         int_set_header_6();
         int_set_header_5();
         int_set_header_4();
         add_3();
     }
+    @hidden
     action int_set_header_0407_i15() {
         int_set_header_7();
         int_set_header_6();
@@ -272,17 +316,18 @@
         // We don't really need a key here, however we add a dummy one as a
         // workaround to ONOS inability to properly support default actions.
         key = {
-            hdr.int_header.isValid(): exact @name("hdr.int_header.is_valid");
+            hdr.int_header.isValid(): exact @name("int_is_valid");
         }
         actions = {
             init_metadata;
             @defaultonly nop;
         }
-        const default_action = nop;
+        const default_action = nop();
         size = 1;
     }
 
     // Table to process instruction bits 0-3.
+    @hidden
     table tb_int_inst_0003 {
         key = {
             hdr.int_header.instruction_mask_0003 : exact;
@@ -305,7 +350,6 @@
             int_set_header_0003_i14;
             int_set_header_0003_i15;
         }
-        size = 16;
         const entries = {
             (0x0) : int_set_header_0003_i0();
             (0x1) : int_set_header_0003_i1();
@@ -327,6 +371,7 @@
     }
 
     // Table to process instruction bits 4-7.
+    @hidden
     table tb_int_inst_0407 {
         key = {
             hdr.int_header.instruction_mask_0407 : exact;
@@ -349,7 +394,6 @@
             int_set_header_0407_i14;
             int_set_header_0407_i15;
         }
-        size = 16;
         const entries = {
             (0x0) : int_set_header_0407_i0();
             (0x1) : int_set_header_0407_i1();
diff --git a/pipelines/fabric/src/main/resources/include/parser.p4 b/pipelines/fabric/src/main/resources/include/parser.p4
index 6aef63b..4a2f85c 100644
--- a/pipelines/fabric/src/main/resources/include/parser.p4
+++ b/pipelines/fabric/src/main/resources/include/parser.p4
@@ -19,11 +19,10 @@
 
 #include "define.p4"
 
-parser FabricParser (
-packet_in packet,
-out parsed_headers_t hdr,
-inout fabric_metadata_t fabric_metadata,
-inout standard_metadata_t standard_metadata) {
+parser FabricParser (packet_in packet,
+                     out parsed_headers_t hdr,
+                     inout fabric_metadata_t fabric_metadata,
+                     inout standard_metadata_t standard_metadata) {
 
     bit<6> last_ipv4_dscp = 0;
 
@@ -41,10 +40,11 @@
 
     state parse_ethernet {
         packet.extract(hdr.ethernet);
-        transition select(hdr.ethernet.ether_type){
+        fabric_metadata.eth_type = hdr.ethernet.eth_type;
+        fabric_metadata.vlan_id = DEFAULT_VLAN_ID;
+        transition select(hdr.ethernet.eth_type){
             ETHERTYPE_VLAN: parse_vlan_tag;
             ETHERTYPE_MPLS: parse_mpls;
-            ETHERTYPE_ARP: parse_arp;
             ETHERTYPE_IPV4: parse_ipv4;
 #ifdef WITH_IPV6
             ETHERTYPE_IPV6: parse_ipv6;
@@ -55,8 +55,23 @@
 
     state parse_vlan_tag {
         packet.extract(hdr.vlan_tag);
-        transition select(hdr.vlan_tag.ether_type){
-            ETHERTYPE_ARP: parse_arp;
+        transition select(hdr.vlan_tag.eth_type){
+            ETHERTYPE_IPV4: parse_ipv4;
+#ifdef WITH_IPV6
+            ETHERTYPE_IPV6: parse_ipv6;
+#endif // WITH_IPV6
+            ETHERTYPE_MPLS: parse_mpls;
+#ifdef WITH_XCONNECT
+            ETHERTYPE_VLAN: parse_inner_vlan_tag;
+#endif // WITH_XCONNECT
+            default: accept;
+        }
+    }
+
+#ifdef WITH_XCONNECT
+    state parse_inner_vlan_tag {
+        packet.extract(hdr.inner_vlan_tag);
+        transition select(hdr.inner_vlan_tag.eth_type){
             ETHERTYPE_IPV4: parse_ipv4;
 #ifdef WITH_IPV6
             ETHERTYPE_IPV6: parse_ipv6;
@@ -65,11 +80,14 @@
             default: accept;
         }
     }
+#endif // WITH_XCONNECT
 
     state parse_mpls {
         packet.extract(hdr.mpls);
+        fabric_metadata.mpls_label = hdr.mpls.label;
+        fabric_metadata.mpls_ttl = hdr.mpls.ttl;
         // There is only one MPLS label for this fabric.
-        // Assume header after MPLS header is IP/IPv6
+        // Assume header after MPLS header is IPv4/IPv6
         // Lookup first 4 bits for version
         transition select(packet.lookahead<bit<IP_VER_LENGTH>>()) {
             //The packet should be either IPv4 or IPv6.
@@ -84,6 +102,7 @@
     state parse_ipv4 {
         packet.extract(hdr.ipv4);
         fabric_metadata.ip_proto = hdr.ipv4.protocol;
+        fabric_metadata.ip_eth_type = ETHERTYPE_IPV4;
         last_ipv4_dscp = hdr.ipv4.dscp;
         //Need header verification?
         transition select(hdr.ipv4.protocol) {
@@ -98,6 +117,7 @@
     state parse_ipv6 {
         packet.extract(hdr.ipv6);
         fabric_metadata.ip_proto = hdr.ipv6.next_hdr;
+        fabric_metadata.ip_eth_type = ETHERTYPE_IPV6;
         transition select(hdr.ipv6.next_hdr) {
             PROTO_TCP: parse_tcp;
             PROTO_UDP: parse_udp;
@@ -107,15 +127,10 @@
     }
 #endif // WITH_IPV6
 
-    state parse_arp {
-        packet.extract(hdr.arp);
-        transition accept;
-    }
-
     state parse_tcp {
         packet.extract(hdr.tcp);
-        fabric_metadata.l4_src_port = hdr.tcp.src_port;
-        fabric_metadata.l4_dst_port = hdr.tcp.dst_port;
+        fabric_metadata.l4_sport = hdr.tcp.sport;
+        fabric_metadata.l4_dport = hdr.tcp.dport;
 #ifdef WITH_INT
         transition parse_int;
 #else
@@ -125,9 +140,9 @@
 
     state parse_udp {
         packet.extract(hdr.udp);
-        fabric_metadata.l4_src_port = hdr.udp.src_port;
-        fabric_metadata.l4_dst_port = hdr.udp.dst_port;
-        transition select(hdr.udp.dst_port) {
+        fabric_metadata.l4_sport = hdr.udp.sport;
+        fabric_metadata.l4_dport = hdr.udp.dport;
+        transition select(hdr.udp.dport) {
 #ifdef WITH_SPGW
             UDP_PORT_GTPU: parse_gtpu;
 #endif // WITH_SPGW
@@ -174,8 +189,8 @@
 
     state parse_inner_udp {
         packet.extract(hdr.inner_udp);
-        fabric_metadata.l4_src_port = hdr.inner_udp.src_port;
-        fabric_metadata.l4_dst_port = hdr.inner_udp.dst_port;
+        fabric_metadata.l4_sport = hdr.inner_udp.sport;
+        fabric_metadata.l4_dport = hdr.inner_udp.dport;
 #ifdef WITH_INT
         transition parse_int;
 #else
@@ -225,7 +240,8 @@
 #endif // WITH_INT
 }
 
-control FabricDeparser(packet_out packet, in parsed_headers_t hdr) {
+control FabricDeparser(packet_out packet,in parsed_headers_t hdr) {
+
     apply {
         packet.emit(hdr.packet_in);
 #ifdef WITH_INT_SINK
@@ -236,8 +252,10 @@
 #endif // WITH_INT_SINK
         packet.emit(hdr.ethernet);
         packet.emit(hdr.vlan_tag);
+#ifdef WITH_XCONNECT
+        packet.emit(hdr.inner_vlan_tag);
+#endif // WITH_XCONNECT
         packet.emit(hdr.mpls);
-        packet.emit(hdr.arp);
 #ifdef WITH_SPGW
         packet.emit(hdr.gtpu_ipv4);
         packet.emit(hdr.gtpu_udp);
diff --git a/pipelines/fabric/src/main/resources/include/spgw.p4 b/pipelines/fabric/src/main/resources/include/spgw.p4
index 5b2cd29..d444e52 100644
--- a/pipelines/fabric/src/main/resources/include/spgw.p4
+++ b/pipelines/fabric/src/main/resources/include/spgw.p4
@@ -40,16 +40,17 @@
 }
 
 control spgw_ingress(
-        inout ipv4_t      gtpu_ipv4,
-        inout udp_t       gtpu_udp,
-        inout gtpu_t      gtpu,
-        inout ipv4_t      ipv4,
-        inout udp_t       udp,
-        inout spgw_meta_t spgw_meta
+        inout ipv4_t            gtpu_ipv4,
+        inout udp_t             gtpu_udp,
+        inout gtpu_t            gtpu,
+        inout ipv4_t            ipv4,
+        inout udp_t             udp,
+        inout fabric_metadata_t fabric_meta
     ) {
 
     direct_counter(CounterType.packets_and_bytes) ue_counter;
 
+    @hidden
     action gtpu_decap() {
         gtpu_ipv4.setInvalid();
         gtpu_udp.setInvalid();
@@ -59,54 +60,57 @@
     action set_dl_sess_info(bit<32> teid,
                             bit<32> s1u_enb_addr,
                             bit<32> s1u_sgw_addr) {
-        spgw_meta.teid = teid;
-        spgw_meta.s1u_enb_addr = s1u_enb_addr;
-        spgw_meta.s1u_sgw_addr = s1u_sgw_addr;
+        fabric_meta.spgw.teid = teid;
+        fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr;
+        fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr;
         ue_counter.count();
     }
 
     table dl_sess_lookup {
         key = {
             // UE addr for downlink
-            ipv4.dst_addr : exact;
+            ipv4.dst_addr : exact @name("ipv4_dst");
         }
         actions = {
             set_dl_sess_info();
+            @defaultonly nop();
         }
+        const default_action = nop();
         counters = ue_counter;
     }
 
     table s1u_filter_table {
         key = {
             // IP addresses of the S1U interfaces of this SPGW-U instance (when uplink)
-            gtpu_ipv4.dst_addr : exact;
+            gtpu_ipv4.dst_addr : exact @name("gtp_ipv4_dst");
         }
         actions = {
-            NoAction();
+            nop();
         }
+        const default_action = nop();
     }
 
 #ifdef WITH_SPGW_PCC_GATING
     action set_sdf_rule_id(sdf_rule_id_t id) {
-        spgw_meta.sdf_rule_id = id;
+        fabric_meta.spgw.sdf_rule_id = id;
     }
 
     action set_pcc_rule_id(pcc_rule_id_t id) {
-        spgw_meta.pcc_rule_id = id;
+        fabric_meta.spgw.pcc_rule_id = id;
     }
 
     action set_pcc_info(pcc_gate_status_t gate_status) {
-        spgw_meta.pcc_gate_status = gate_status;
+        fabric_meta.spgw.pcc_gate_status = gate_status;
     }
 
     table sdf_rule_lookup {
         key = {
-            spgw_meta.direction   : exact;
-            ipv4.src_addr         : ternary;
-            ipv4.dst_addr         : ternary;
-            ipv4.protocol         : ternary;
-            spgw_meta.l4_src_port : ternary;
-            spgw_meta.l4_dst_port : ternary;
+            fabric_meta.spgw.direction   : exact @name("spgw_direction");
+            ipv4.src_addr                : ternary @name("ipv4_src");
+            ipv4.dst_addr                : ternary @name("ipv4_dst");
+            ipv4.protocol                : ternary @name("ip_proto");
+            fabric_meta.l4_sport         : ternary @name("l4_sport");
+            fabric_meta.l4_dport         : ternary @name("l4_dport");
         }
         actions = {
             set_sdf_rule_id();
@@ -116,7 +120,7 @@
 
     table pcc_rule_lookup {
         key = {
-            spgw_meta.sdf_rule_id : exact;
+            fabric_meta.spgw.sdf_rule_id : exact @name("sdf_rule_id");
         }
         actions = {
             set_pcc_rule_id();
@@ -126,7 +130,7 @@
 
     table pcc_info_lookup {
         key = {
-            spgw_meta.pcc_rule_id : exact;
+            fabric_meta.spgw.pcc_rule_id : exact @name("pcc_rule_id");
         }
         actions = {
             set_pcc_info();
@@ -141,33 +145,33 @@
             // S1U_SGW_PREFIX/S1U_SGW_PREFIX_LEN subnet.
             // TODO: check also that gtpu.msgtype == GTP_GPDU
             if (!s1u_filter_table.apply().hit) {
-                drop_now();
+                mark_to_drop();
             }
-            spgw_meta.direction = SPGW_DIR_UPLINK;
+            fabric_meta.spgw.direction = SPGW_DIR_UPLINK;
             gtpu_decap();
         } else if (dl_sess_lookup.apply().hit) {
-            spgw_meta.direction = SPGW_DIR_DOWNLINK;
+            fabric_meta.spgw.direction = SPGW_DIR_DOWNLINK;
         } else {
-            spgw_meta.direction = SPGW_DIR_UNKNOWN;
+            fabric_meta.spgw.direction = SPGW_DIR_UNKNOWN;
             // No SPGW processing needed.
             return;
         }
 
 #ifdef WITH_SPGW_PCC_GATING
         // Allow all traffic by default.
-        spgw_meta.pcc_gate_status = PCC_GATE_OPEN;
+        fabric_meta.spgw.pcc_gate_status = PCC_GATE_OPEN;
 
         sdf_rule_lookup.apply();
         pcc_rule_lookup.apply();
         pcc_info_lookup.apply();
 
-        if (spgw_meta.pcc_gate_status == PCC_GATE_CLOSED) {
-            drop_now();
+        if (fabric_meta.spgw.pcc_gate_status == PCC_GATE_CLOSED) {
+            mark_to_drop();
         }
 #endif // WITH_SPGW_PCC_GATING
 
         // Don't ask why... we'll need this later.
-        spgw_meta.ipv4_len = ipv4.total_len;
+        fabric_meta.spgw.ipv4_len = ipv4.total_len;
     }
 }
 
@@ -177,10 +181,11 @@
         inout ipv4_t              gtpu_ipv4,
         inout udp_t               gtpu_udp,
         inout gtpu_t              gtpu,
-        in    spgw_meta_t         spgw_meta,
+        in    fabric_metadata_t   fabric_meta,
         in    standard_metadata_t std_meta
     ) {
 
+    @hidden
     action gtpu_encap() {
         gtpu_ipv4.setValid();
         gtpu_ipv4.version = IP_VERSION_4;
@@ -194,14 +199,14 @@
         gtpu_ipv4.frag_offset = 0;
         gtpu_ipv4.ttl = DEFAULT_IPV4_TTL;
         gtpu_ipv4.protocol = PROTO_UDP;
-        gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr;
-        gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr;
+        gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr;
+        gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr;
         gtpu_ipv4.hdr_checksum = 0; // Updated later
 
         gtpu_udp.setValid();
-        gtpu_udp.src_port = UDP_PORT_GTPU;
-        gtpu_udp.dst_port = UDP_PORT_GTPU;
-        gtpu_udp.len = spgw_meta.ipv4_len
+        gtpu_udp.sport = UDP_PORT_GTPU;
+        gtpu_udp.dport = UDP_PORT_GTPU;
+        gtpu_udp.len = fabric_meta.spgw.ipv4_len
                 + (UDP_HDR_SIZE + GTP_HDR_SIZE);
         gtpu_udp.checksum = 0; // Updated later
 
@@ -213,12 +218,12 @@
         gtpu.seq_flag = 0;
         gtpu.npdu_flag = 0;
         gtpu.msgtype = GTP_GPDU;
-        gtpu.msglen = spgw_meta.ipv4_len;
-        gtpu.teid = spgw_meta.teid;
+        gtpu.msglen = fabric_meta.spgw.ipv4_len;
+        gtpu.teid = fabric_meta.spgw.teid;
     }
 
     apply {
-        if (spgw_meta.direction == SPGW_DIR_DOWNLINK) {
+        if (fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK) {
             gtpu_encap();
         }
     }
@@ -262,8 +267,8 @@
                 8w0,
                 gtpu_ipv4.protocol,
                 gtpu_udp.len,
-                gtpu_udp.src_port,
-                gtpu_udp.dst_port,
+                gtpu_udp.sport,
+                gtpu_udp.dport,
                 gtpu_udp.len,
                 gtpu,
                 ipv4,
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index b20a1ff..e77a652 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -4,32 +4,36 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["last_ipv4_dscp", 6, false],
-        ["tmp", 4, false],
-        ["tmp_0", 8, false],
+        ["last_ipv4_dscp_0", 6, false],
+        ["tmp_0", 4, false],
+        ["tmp", 8, false],
         ["tmp_1", 32, false],
         ["tmp_2", 32, false],
         ["tmp_3", 32, false],
-        ["spgw_ingress_tmp_1", 1, false],
-        ["spgw_ingress_tmp_2", 1, false],
-        ["filtering_tmp_0", 1, false],
-        ["next_tmp_2", 1, false],
-        ["next_tmp_3", 1, false],
-        ["next_tmp_4", 1, false],
-        ["spgw_normalizer_hasReturned_0", 1, false],
-        ["spgw_ingress_hasReturned_0", 1, false],
-        ["next_hasReturned_0", 1, false],
-        ["process_int_main_process_int_transit_hasReturned_0", 1, false],
+        ["spgw_ingress_tmp", 1, false],
+        ["spgw_ingress_tmp_0", 1, false],
+        ["spgw_normalizer_hasReturned", 1, false],
+        ["spgw_ingress_hasReturned", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["process_int_main_process_int_transit_hasReturned", 1, false],
+        ["fabric_metadata_t.eth_type", 16, false],
+        ["fabric_metadata_t.ip_eth_type", 16, false],
+        ["fabric_metadata_t.vlan_id", 12, false],
+        ["fabric_metadata_t.vlan_pri", 3, false],
+        ["fabric_metadata_t.vlan_cfi", 1, false],
+        ["fabric_metadata_t.mpls_label", 20, false],
+        ["fabric_metadata_t.mpls_ttl", 8, false],
+        ["fabric_metadata_t.skip_forwarding", 1, false],
+        ["fabric_metadata_t.skip_next", 1, false],
         ["fabric_metadata_t.fwd_type", 3, false],
         ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.pop_vlan_when_packet_in", 1, false],
         ["fabric_metadata_t.is_multicast", 1, false],
         ["fabric_metadata_t.is_controller_packet_out", 1, false],
         ["fabric_metadata_t.clone_to_cpu", 1, false],
         ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_src_port", 16, false],
-        ["fabric_metadata_t.l4_dst_port", 16, false],
-        ["_padding_2", 5, false]
+        ["fabric_metadata_t.l4_sport", 16, false],
+        ["fabric_metadata_t.l4_dport", 16, false],
+        ["_padding_2", 4, false]
       ]
     },
     {
@@ -66,7 +70,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -76,7 +80,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -112,8 +116,8 @@
       "name" : "udp_t",
       "id" : 6,
       "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["len", 16, false],
         ["checksum", 16, false]
       ]
@@ -148,22 +152,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 9,
       "fields" : [
-        ["hw_type", 16, false],
-        ["proto_type", 16, false],
-        ["hw_addr_len", 8, false],
-        ["proto_addr_len", 8, false],
-        ["opcode", 16, false]
-      ]
-    },
-    {
-      "name" : "tcp_t",
-      "id" : 10,
-      "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["seq_no", 32, false],
         ["ack_no", 32, false],
         ["data_offset", 4, false],
@@ -177,7 +170,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -189,7 +182,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -197,7 +190,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 13,
+      "id" : 12,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -205,7 +198,7 @@
     },
     {
       "name" : "report_fixed_header_t",
-      "id" : 14,
+      "id" : 13,
       "fields" : [
         ["ver", 4, false],
         ["nproto", 4, false],
@@ -220,7 +213,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 15,
+      "id" : 14,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -230,7 +223,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 16,
+      "id" : 15,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -249,14 +242,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 17,
+      "id" : 16,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 18,
+      "id" : 17,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -264,14 +257,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 19,
+      "id" : 18,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 20,
+      "id" : 19,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -279,21 +272,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 21,
+      "id" : 20,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 22,
+      "id" : 21,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 23,
+      "id" : 22,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -301,14 +294,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 24,
+      "id" : 23,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "int_data_t",
-      "id" : 25,
+      "id" : 24,
       "fields" : [
         ["data", "*"]
       ],
@@ -316,7 +309,7 @@
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 26,
+      "id" : 25,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -326,7 +319,7 @@
     },
     {
       "name" : "spgw_meta_t",
-      "id" : 27,
+      "id" : 26,
       "fields" : [
         ["direction", 2, false],
         ["ipv4_len", 16, false],
@@ -338,7 +331,7 @@
     },
     {
       "name" : "int_metadata_t",
-      "id" : 28,
+      "id" : 27,
       "fields" : [
         ["source", 1, 0],
         ["transit", 1, 0],
@@ -382,65 +375,65 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "inner_vlan_tag",
       "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 5,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 5,
+      "id" : 6,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_ipv4",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv6",
-      "id" : 11,
-      "header_type" : "ipv6_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 12,
-      "header_type" : "arp_t",
+      "header_type" : "ipv6_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -640,7 +633,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "hexstr",
@@ -705,6 +698,32 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -722,12 +741,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -747,7 +760,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -768,12 +781,58 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
+              "value" : "0x86dd",
+              "mask" : null,
+              "next_state" : "parse_ipv6"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -799,13 +858,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["inner_vlan_tag", "eth_type"]
             }
           ]
         },
         {
           "name" : "parse_mpls",
-          "id" : 4,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -820,7 +879,33 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -852,13 +937,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -886,7 +971,20 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -930,7 +1028,7 @@
         },
         {
           "name" : "parse_ipv6",
-          "id" : 6,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -953,6 +1051,19 @@
                 }
               ],
               "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x86dd"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -988,29 +1099,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 7,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 8,
           "parser_ops" : [
@@ -1027,11 +1115,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "src_port"]
+                  "value" : ["tcp", "sport"]
                 }
               ],
               "op" : "set"
@@ -1040,11 +1128,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "dst_port"]
+                  "value" : ["tcp", "dport"]
                 }
               ],
               "op" : "set"
@@ -1076,11 +1164,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "src_port"]
+                  "value" : ["udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -1089,11 +1177,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "dst_port"]
+                  "value" : ["udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -1115,7 +1203,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -1150,7 +1238,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp"]
                 },
                 {
                   "type" : "expression",
@@ -1209,7 +1297,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             }
           ]
         },
@@ -1239,7 +1327,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -1298,11 +1386,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "src_port"]
+                  "value" : ["inner_udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -1311,11 +1399,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "dst_port"]
+                  "value" : ["inner_udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -1350,7 +1438,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "last_ipv4_dscp"]
+              "value" : ["scalars", "last_ipv4_dscp_0"]
             }
           ]
         },
@@ -1526,11 +1614,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "report_ethernet", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "mpls", "arp", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
+      "order" : ["packet_in", "report_ethernet", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
     }
   ],
   "meter_arrays" : [],
@@ -1566,7 +1654,7 @@
       "binding" : "FabricIngress.process_set_source_sink.tb_set_sink",
       "source_info" : {
         "filename" : "include/int/int_main.p4",
-        "line" : 58,
+        "line" : 60,
         "column" : 50,
         "source_fragment" : "counter_set_sink"
       }
@@ -1578,7 +1666,7 @@
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 34,
+        "line" : 31,
         "column" : 50,
         "source_fragment" : "ingress_port_vlan_counter"
       }
@@ -1590,7 +1678,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -1602,7 +1690,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -1614,7 +1702,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1626,89 +1714,101 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 80,
+        "line" : 82,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
     },
     {
-      "name" : "FabricIngress.forwarding.acl_counter",
-      "id" : 8,
-      "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
-      "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
-        "column" : 50,
-        "source_fragment" : "acl_counter"
-      }
-    },
-    {
       "name" : "FabricIngress.forwarding.routing_v6_counter",
-      "id" : 9,
+      "id" : 8,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.routing_v6",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 171,
+        "line" : 110,
         "column" : 50,
         "source_fragment" : "routing_v6_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.acl.acl_counter",
+      "id" : 9,
+      "is_direct" : true,
+      "binding" : "FabricIngress.acl.acl",
+      "source_info" : {
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
+        "column" : 50,
+        "source_fragment" : "acl_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 10,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.vlan_meta",
+      "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 58,
+        "line" : 67,
         "column" : 50,
-        "source_fragment" : "vlan_meta_counter"
+        "source_fragment" : "next_vlan_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.xconnect_counter",
+      "id" : 11,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.xconnect",
+      "source_info" : {
+        "filename" : "include/control/next.p4",
+        "line" : 91,
+        "column" : 50,
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
       "name" : "FabricIngress.next.simple_counter",
-      "id" : 11,
+      "id" : 12,
       "is_direct" : true,
       "binding" : "FabricIngress.next.simple",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 123,
         "column" : 50,
         "source_fragment" : "simple_counter"
       }
     },
     {
       "name" : "FabricIngress.next.hashed_counter",
-      "id" : 12,
+      "id" : 13,
       "is_direct" : true,
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
     },
     {
       "name" : "FabricIngress.next.multicast_counter",
-      "id" : 13,
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
     },
     {
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
-      "id" : 14,
+      "id" : 15,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -1717,10 +1817,10 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 15,
+      "id" : 16,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -1729,7 +1829,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 16,
+      "id" : 17,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -1741,12 +1841,12 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 17,
+      "id" : 18,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -1820,7 +1920,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1941,67 +2041,67 @@
   "learn_lists" : [],
   "actions" : [
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 0,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 1,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 2,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 3,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 4,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 5,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 6,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 7,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 8,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 9,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 10,
       "runtime_data" : [],
       "primitives" : []
@@ -2013,31 +2113,10 @@
       "primitives" : []
     },
     {
-      "name" : "drop_now",
+      "name" : "nop",
       "id" : 12,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
       "name" : "FabricIngress.spgw_ingress.gtpu_decap",
@@ -2054,7 +2133,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 54,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
           }
@@ -2069,7 +2148,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
           }
@@ -2084,7 +2163,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
           }
@@ -2123,9 +2202,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 62,
+            "line" : 63,
             "column" : 8,
-            "source_fragment" : "spgw_meta.teid = teid"
+            "source_fragment" : "fabric_meta.spgw.teid = teid"
           }
         },
         {
@@ -2142,9 +2221,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 63,
+            "line" : 64,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
           }
         },
         {
@@ -2161,9 +2240,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 64,
+            "line" : 65,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
           }
         }
       ]
@@ -2233,7 +2312,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 61,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "fabric_metadata.int_meta.sink = true"
           }
@@ -2241,179 +2320,16 @@
       ]
     },
     {
-      "name" : "FabricIngress.filtering.drop",
+      "name" : "FabricIngress.filtering.deny",
       "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 18,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 19,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "cfi"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "pri"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 52,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 99,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
+              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -2432,22 +2348,82 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
+            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 20,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 19,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 21,
+      "id" : 20,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2469,7 +2445,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -2478,7 +2454,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 22,
+      "id" : 21,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2500,16 +2476,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 37,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 23,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2518,18 +2494,22 @@
       ],
       "primitives" : [
         {
-          "op" : "remove_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "mpls"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
             }
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 60,
+            "line" : 62,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
           }
         },
         {
@@ -2546,16 +2526,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 61,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 24,
+      "id" : 23,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2577,21 +2557,52 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 25,
+      "id" : 24,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
+      "id" : 25,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.set_next_id_acl",
       "id" : 26,
       "runtime_data" : [
         {
@@ -2613,8 +2624,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 110,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -2622,7 +2633,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
+      "name" : "FabricIngress.acl.punt_to_cpu",
       "id" : 27,
       "runtime_data" : [],
       "primitives" : [
@@ -2639,26 +2650,45 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 116,
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
         },
         {
-          "op" : "exit",
-          "parameters" : [],
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 118,
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
             "column" : 8,
-            "source_fragment" : "exit"
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.clone_to_cpu",
+      "name" : "FabricIngress.acl.clone_to_cpu",
       "id" : 28,
       "runtime_data" : [],
       "primitives" : [
@@ -2685,8 +2715,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 123,
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "fabric_metadata.clone_to_cpu = true"
           }
@@ -2694,7 +2724,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
+      "name" : "FabricIngress.acl.drop",
       "id" : 29,
       "runtime_data" : [],
       "primitives" : [
@@ -2702,25 +2732,116 @@
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 128,
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
+          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_acl",
+      "name" : "FabricIngress.acl.nop_acl",
       "id" : 30,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
+      "name" : "FabricIngress.next.set_vlan",
       "id" : 31,
       "runtime_data" : [
         {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 70,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_xconnect",
+      "id" : 32,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 33,
+      "runtime_data" : [
+        {
           "name" : "next_id",
           "bitwidth" : 32
         }
@@ -2739,8 +2860,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 174,
+            "filename" : "include/control/next.p4",
+            "line" : 99,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -2748,76 +2869,10 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.set_vlan",
-      "id" : 32,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 61,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricIngress.next.output_simple",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_vlan_output",
       "id" : 34,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
           "name" : "port_num",
           "bitwidth" : 9
         }
@@ -2828,7 +2883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["standard_metadata", "egress_spec"]
             },
             {
               "type" : "runtime_data",
@@ -2837,34 +2892,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_simple",
+      "name" : "FabricIngress.next.routing_simple",
       "id" : 35,
       "runtime_data" : [
         {
@@ -2895,7 +2931,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2933,15 +2969,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_simple",
+      "name" : "FabricIngress.next.mpls_routing_simple",
       "id" : 36,
       "runtime_data" : [
         {
@@ -2967,6 +3003,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -2976,7 +3031,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -3014,142 +3069,20 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v6_simple",
+      "name" : "FabricIngress.next.output_hashed",
       "id" : 37,
       "runtime_data" : [
         {
           "name" : "port_num",
           "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -3158,44 +3091,6 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["standard_metadata", "egress_spec"]
             },
             {
@@ -3205,125 +3100,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_vlan",
+      "name" : "FabricIngress.next.routing_hashed",
       "id" : 38,
       "runtime_data" : [
         {
@@ -3337,10 +3122,6 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
         }
       ],
       "primitives" : [
@@ -3358,7 +3139,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -3387,25 +3168,6 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["standard_metadata", "egress_spec"]
             },
             {
@@ -3415,15 +3177,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_hashed",
+      "name" : "FabricIngress.next.mpls_routing_hashed",
       "id" : 39,
       "runtime_data" : [
         {
@@ -3437,6 +3199,10 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -3445,6 +3211,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -3454,7 +3239,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -3492,401 +3277,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
+      "name" : "FabricIngress.next.set_mcast_group_id",
       "id" : 40,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 41,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 42,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -3905,9 +3308,9 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "standard_metadata.mcast_grp = gid"
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
         },
         {
@@ -3934,7 +3337,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -3943,7 +3346,7 @@
     },
     {
       "name" : "act",
-      "id" : 43,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3951,7 +3354,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3979,7 +3382,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 44,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3992,7 +3395,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -4007,7 +3410,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -4017,7 +3420,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4039,7 +3442,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 45,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4065,7 +3468,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 46,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4087,7 +3490,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 47,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4151,7 +3554,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 48,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4168,7 +3571,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 26,
+            "line" : 25,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
           }
@@ -4183,7 +3586,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -4212,7 +3615,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -4221,6 +3624,115 @@
     },
     {
       "name" : "act_5",
+      "id" : 47,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 103,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_6",
+      "id" : 48,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x41"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 113,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
       "id" : 49,
       "runtime_data" : [],
       "primitives" : [
@@ -4229,7 +3741,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -4250,7 +3762,7 @@
       ]
     },
     {
-      "name" : "act_6",
+      "name" : "act_8",
       "id" : 50,
       "runtime_data" : [],
       "primitives" : [
@@ -4259,7 +3771,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -4280,11 +3792,28 @@
       ]
     },
     {
-      "name" : "act_7",
+      "name" : "act_9",
       "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 148,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 52,
+      "runtime_data" : [],
+      "primitives" : [
+        {
           "op" : "assign",
           "parameters" : [
             {
@@ -4298,7 +3827,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 137,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -4306,37 +3835,7 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 52,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
+      "name" : "act_11",
       "id" : 53,
       "runtime_data" : [],
       "primitives" : [
@@ -4345,82 +3844,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 54,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x02"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 130,
-            "column" : 38,
-            "source_fragment" : "2w2; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 55,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 37,
-            "source_fragment" : "2w0; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4436,19 +3860,13 @@
                 }
               }
             }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 153,
-            "column" : 12,
-            "source_fragment" : "return"
-          }
+          ]
         }
       ]
     },
     {
       "name" : "act_12",
-      "id" : 56,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4456,7 +3874,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4478,7 +3896,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 57,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4486,25 +3904,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["userMetadata.spgw", "direction"]
             },
             {
-              "type" : "field",
-              "value" : ["ipv4", "total_len"]
+              "type" : "hexstr",
+              "value" : "0x02"
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 170,
-            "column" : 8,
-            "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
+            "filename" : "include/control/../define.p4",
+            "line" : 138,
+            "column" : 38,
+            "source_fragment" : "2w2; ..."
           }
         }
       ]
     },
     {
       "name" : "act_14",
-      "id" : 58,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4512,7 +3930,26 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["userMetadata.spgw", "direction"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 136,
+            "column" : 37,
+            "source_fragment" : "2w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4528,13 +3965,19 @@
                 }
               }
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 157,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
         }
       ]
     },
     {
       "name" : "act_15",
-      "id" : 59,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4542,7 +3985,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4564,7 +4007,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 60,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4572,395 +4015,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["userMetadata.spgw", "ipv4_len"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x07"
+              "type" : "field",
+              "value" : ["ipv4", "total_len"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 119,
-            "column" : 31,
-            "source_fragment" : "7; ..."
+            "filename" : "include/spgw.p4",
+            "line" : 174,
+            "column" : 8,
+            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
           }
         }
       ]
     },
     {
       "name" : "act_17",
-      "id" : 61,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 102,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_18",
-      "id" : 62,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 64,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_21",
-      "id" : 65,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_22",
-      "id" : 66,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_23",
-      "id" : 67,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_24",
-      "id" : 68,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_25",
-      "id" : 69,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 223,
-            "column" : 20,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_26",
-      "id" : 70,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv4", "ttl"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv4", "ttl"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 230,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_27",
-      "id" : 71,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv6", "hop_limit"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv6", "hop_limit"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 234,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_28",
-      "id" : 72,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4990,7 +4063,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
           }
@@ -5009,7 +4082,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
           }
@@ -5017,8 +4090,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 73,
+      "name" : "act_18",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5048,7 +4121,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
           }
@@ -5067,7 +4140,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
           }
@@ -5075,8 +4148,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 74,
+      "name" : "act_19",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5093,7 +4166,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 85,
+            "line" : 89,
             "column" : 12,
             "source_fragment" : "clone(CloneType.I2E, REPORT_MIRROR_SESSION_ID)"
           }
@@ -5101,98 +4174,44 @@
       ]
     },
     {
-      "name" : "NoAction",
-      "id" : 75,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 76,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 77,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 78,
+      "name" : "nop",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 79,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 80,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 81,
+      "name" : "nop",
+      "id" : 65,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 82,
+      "name" : "NoAction",
+      "id" : 66,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 67,
+      "runtime_data" : [],
+      "primitives" : []
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 83,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5205,7 +4224,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 185,
+            "line" : 190,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
           }
@@ -5224,7 +4243,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 186,
+            "line" : 191,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
           }
@@ -5243,7 +4262,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 111,
+            "line" : 119,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -5262,7 +4281,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 188,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dscp = 0"
           }
@@ -5281,7 +4300,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 189,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.ecn = 0"
           }
@@ -5323,7 +4342,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 190,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
           }
@@ -5342,7 +4361,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 192,
+            "line" : 197,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
           }
@@ -5361,7 +4380,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 193,
+            "line" : 198,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
           }
@@ -5380,7 +4399,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 194,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
           }
@@ -5399,7 +4418,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -5418,7 +4437,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -5437,9 +4456,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 197,
+            "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
           }
         },
         {
@@ -5456,9 +4475,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 198,
+            "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
           }
         },
         {
@@ -5475,7 +4494,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 199,
+            "line" : 204,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
           }
@@ -5490,7 +4509,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 201,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
           }
@@ -5500,7 +4519,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "src_port"]
+              "value" : ["gtpu_udp", "sport"]
             },
             {
               "type" : "hexstr",
@@ -5509,9 +4528,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 202,
+            "line" : 207,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.src_port = 2152"
+            "source_fragment" : "gtpu_udp.sport = 2152"
           }
         },
         {
@@ -5519,7 +4538,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "dst_port"]
+              "value" : ["gtpu_udp", "dport"]
             },
             {
               "type" : "hexstr",
@@ -5528,9 +4547,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 203,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.dst_port = 2152"
+            "source_fragment" : "gtpu_udp.dport = 2152"
           }
         },
         {
@@ -5570,9 +4589,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 204,
+            "line" : 209,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
+            "source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
           }
         },
         {
@@ -5589,7 +4608,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 206,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
           }
@@ -5604,7 +4623,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 208,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
           }
@@ -5623,7 +4642,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 209,
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
           }
@@ -5642,7 +4661,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 210,
+            "line" : 215,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
           }
@@ -5661,7 +4680,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 211,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
           }
@@ -5680,7 +4699,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 212,
+            "line" : 217,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
           }
@@ -5699,7 +4718,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 213,
+            "line" : 218,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
           }
@@ -5718,7 +4737,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 214,
+            "line" : 219,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
           }
@@ -5737,7 +4756,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 215,
+            "line" : 220,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
           }
@@ -5756,9 +4775,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 216,
+            "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
           }
         },
         {
@@ -5775,16 +4794,16 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 217,
+            "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = spgw_meta.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
           }
         }
       ]
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 84,
+      "id" : 69,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -5814,7 +4833,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setValid()"
           }
@@ -5833,7 +4852,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 33,
+            "line" : 34,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.int_type = 1"
           }
@@ -5852,7 +4871,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 139,
+            "line" : 147,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -5867,7 +4886,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setValid()"
           }
@@ -5886,7 +4905,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ver = 0"
           }
@@ -5905,7 +4924,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 38,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rep = 0"
           }
@@ -5924,7 +4943,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 39,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.int_header.c = 0"
           }
@@ -5943,7 +4962,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_header.e = 0"
           }
@@ -5962,7 +4981,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rsvd1 = 0"
           }
@@ -5981,7 +5000,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 42,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ins_cnt = ins_cnt; ..."
           }
@@ -6000,7 +5019,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 43,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.int_header.max_hop_cnt = max_hop; ..."
           }
@@ -6019,7 +5038,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 44,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = 0"
           }
@@ -6038,7 +5057,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 45,
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0003 = ins_mask0003; ..."
           }
@@ -6057,7 +5076,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 46,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0407 = ins_mask0407; ..."
           }
@@ -6076,7 +5095,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 47,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0811 = 0"
           }
@@ -6095,7 +5114,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 48,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_1215 = 0"
           }
@@ -6110,7 +5129,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setValid()"
           }
@@ -6129,7 +5148,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 51,
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.next_proto = hdr.ipv4.protocol"
           }
@@ -6143,14 +5162,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 52,
+            "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dst_port"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
           }
         },
         {
@@ -6167,7 +5186,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 53,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.dscp = hdr.ipv4.dscp"
           }
@@ -6209,7 +5228,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + INT_HEADER_LEN_BYTES"
           }
@@ -6251,7 +5270,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + INT_HEADER_LEN_BYTES"
           }
@@ -6270,7 +5289,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 143,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -6279,7 +5298,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 85,
+      "id" : 70,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -6339,13 +5358,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 86,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 87,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6358,7 +5377,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6377,7 +5396,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6409,7 +5428,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6451,7 +5470,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6493,7 +5512,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6502,7 +5521,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 88,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6515,7 +5534,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6534,7 +5553,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6576,7 +5595,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6618,7 +5637,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6627,7 +5646,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 89,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6640,7 +5659,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6659,7 +5678,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6691,7 +5710,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6706,7 +5725,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6725,7 +5744,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6767,7 +5786,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6809,7 +5828,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6818,7 +5837,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 90,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6831,7 +5850,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6863,7 +5882,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6895,7 +5914,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6937,7 +5956,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6979,7 +5998,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6988,7 +6007,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 91,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7001,7 +6020,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7020,7 +6039,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7052,7 +6071,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7067,7 +6086,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7099,7 +6118,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7131,7 +6150,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7173,7 +6192,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7215,7 +6234,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7224,7 +6243,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 92,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7237,7 +6256,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7256,7 +6275,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7271,7 +6290,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7303,7 +6322,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7335,7 +6354,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7377,7 +6396,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7419,7 +6438,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7428,7 +6447,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 93,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7441,7 +6460,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7460,7 +6479,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7492,7 +6511,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7507,7 +6526,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7526,7 +6545,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7541,7 +6560,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7573,7 +6592,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7605,7 +6624,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7647,7 +6666,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -7689,7 +6708,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -7698,7 +6717,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 94,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7711,7 +6730,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7730,7 +6749,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7772,7 +6791,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7814,7 +6833,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7823,7 +6842,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 95,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7836,7 +6855,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7855,7 +6874,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7887,7 +6906,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7902,7 +6921,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7921,7 +6940,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7963,7 +6982,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8005,7 +7024,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8014,7 +7033,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 96,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8027,7 +7046,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8046,7 +7065,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8061,7 +7080,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8080,7 +7099,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8122,7 +7141,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8164,7 +7183,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8173,7 +7192,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 97,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8186,7 +7205,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8205,7 +7224,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8237,7 +7256,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -8252,7 +7271,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8271,7 +7290,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8286,7 +7305,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8305,7 +7324,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8347,7 +7366,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8389,7 +7408,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8398,7 +7417,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 98,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8411,7 +7430,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8443,7 +7462,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8475,7 +7494,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8490,7 +7509,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8509,7 +7528,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8551,7 +7570,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8593,7 +7612,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8602,7 +7621,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 99,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8615,7 +7634,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8634,7 +7653,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8666,7 +7685,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -8681,7 +7700,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8713,7 +7732,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8745,7 +7764,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8760,7 +7779,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8779,7 +7798,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8821,7 +7840,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8863,7 +7882,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8872,7 +7891,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 100,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8885,7 +7904,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8904,7 +7923,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8919,7 +7938,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8951,7 +7970,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8983,7 +8002,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8998,7 +8017,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -9017,7 +8036,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -9059,7 +8078,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9101,7 +8120,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9110,7 +8129,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 101,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9123,7 +8142,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -9142,7 +8161,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -9174,7 +8193,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -9189,7 +8208,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -9208,7 +8227,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -9223,7 +8242,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -9255,7 +8274,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -9287,7 +8306,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -9302,7 +8321,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -9321,7 +8340,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -9363,7 +8382,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -9405,7 +8424,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -9414,13 +8433,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 102,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 103,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9433,7 +8452,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9452,7 +8471,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9494,7 +8513,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -9536,7 +8555,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -9545,7 +8564,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 104,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9558,7 +8577,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9577,7 +8596,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9596,7 +8615,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9638,7 +8657,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -9680,7 +8699,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -9689,7 +8708,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 105,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9702,7 +8721,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9721,7 +8740,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9736,7 +8755,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9755,7 +8774,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9774,7 +8793,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9816,7 +8835,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9858,7 +8877,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9867,7 +8886,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 106,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9880,7 +8899,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9922,7 +8941,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9964,7 +8983,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -10006,7 +9025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -10015,7 +9034,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 107,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10028,7 +9047,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10047,7 +9066,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10062,7 +9081,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10104,7 +9123,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10146,7 +9165,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10188,7 +9207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10197,7 +9216,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 108,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10210,7 +9229,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10229,7 +9248,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10248,7 +9267,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10263,7 +9282,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10305,7 +9324,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10347,7 +9366,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10389,7 +9408,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10398,7 +9417,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 109,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10411,7 +9430,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10430,7 +9449,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10445,7 +9464,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10464,7 +9483,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10483,7 +9502,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10498,7 +9517,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10540,7 +9559,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10582,7 +9601,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -10624,7 +9643,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -10633,7 +9652,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 110,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10646,7 +9665,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10665,7 +9684,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10707,7 +9726,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -10749,7 +9768,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -10758,7 +9777,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 111,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10771,7 +9790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10790,7 +9809,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10805,7 +9824,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10824,7 +9843,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10866,7 +9885,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10908,7 +9927,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10917,7 +9936,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 112,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10930,7 +9949,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10949,7 +9968,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10968,7 +9987,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10983,7 +10002,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11002,7 +10021,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11044,7 +10063,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -11086,7 +10105,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -11095,7 +10114,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 113,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11108,7 +10127,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11127,7 +10146,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11142,7 +10161,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11161,7 +10180,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11180,7 +10199,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11195,7 +10214,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11214,7 +10233,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11256,7 +10275,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11298,7 +10317,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11307,7 +10326,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 114,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11320,7 +10339,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11362,7 +10381,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11377,7 +10396,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11396,7 +10415,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11438,7 +10457,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -11480,7 +10499,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -11489,7 +10508,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 115,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11502,7 +10521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11521,7 +10540,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11536,7 +10555,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11578,7 +10597,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11593,7 +10612,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11612,7 +10631,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11654,7 +10673,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11696,7 +10715,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11705,7 +10724,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 116,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11718,7 +10737,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11737,7 +10756,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11756,7 +10775,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11771,7 +10790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11813,7 +10832,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11828,7 +10847,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11847,7 +10866,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11889,7 +10908,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11931,7 +10950,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11940,7 +10959,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 117,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11953,7 +10972,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11972,7 +10991,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11987,7 +11006,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -12006,7 +11025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -12025,7 +11044,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -12040,7 +11059,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -12082,7 +11101,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -12097,7 +11116,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -12116,7 +11135,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -12158,7 +11177,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -12200,7 +11219,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -12209,7 +11228,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 118,
+      "id" : 103,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -12243,7 +11262,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 49,
+            "line" : 50,
             "column" : 8,
             "source_fragment" : "hdr.report_ethernet.setValid()"
           }
@@ -12262,7 +11281,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.report_ethernet.dst_addr = mon_mac"
           }
@@ -12281,7 +11300,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 51,
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.report_ethernet.src_addr = src_mac"
           }
@@ -12291,7 +11310,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["report_ethernet", "ether_type"]
+              "value" : ["report_ethernet", "eth_type"]
             },
             {
               "type" : "hexstr",
@@ -12300,7 +11319,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 102,
+            "line" : 110,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -12315,7 +11334,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.setValid()"
           }
@@ -12334,7 +11353,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.version = 4w4"
           }
@@ -12353,7 +11372,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 57,
+            "line" : 58,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.ihl = 4w5"
           }
@@ -12372,7 +11391,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 58,
+            "line" : 59,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.dscp = 6w0"
           }
@@ -12391,7 +11410,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 59,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.ecn = 2w0"
           }
@@ -12433,7 +11452,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 61,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.total_len = (bit<16>) IPV4_MIN_HEAD_LEN + (bit<16>) UDP_HEADER_LEN + ..."
           }
@@ -12452,7 +11471,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 64,
+            "line" : 65,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.identification = 0"
           }
@@ -12471,7 +11490,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 65,
+            "line" : 66,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.flags = 0"
           }
@@ -12490,7 +11509,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 66,
+            "line" : 67,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.frag_offset = 0"
           }
@@ -12509,7 +11528,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 67,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.ttl = 0xFF"
           }
@@ -12528,7 +11547,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -12547,7 +11566,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 69,
+            "line" : 70,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.src_addr = src_ip"
           }
@@ -12566,7 +11585,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 70,
+            "line" : 71,
             "column" : 8,
             "source_fragment" : "hdr.report_ipv4.dst_addr = mon_ip"
           }
@@ -12581,7 +11600,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 73,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.report_udp.setValid()"
           }
@@ -12591,7 +11610,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["report_udp", "src_port"]
+              "value" : ["report_udp", "sport"]
             },
             {
               "type" : "hexstr",
@@ -12600,9 +11619,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 74,
+            "line" : 75,
             "column" : 8,
-            "source_fragment" : "hdr.report_udp.src_port = 0"
+            "source_fragment" : "hdr.report_udp.sport = 0"
           }
         },
         {
@@ -12610,7 +11629,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["report_udp", "dst_port"]
+              "value" : ["report_udp", "dport"]
             },
             {
               "type" : "runtime_data",
@@ -12619,9 +11638,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 75,
+            "line" : 76,
             "column" : 8,
-            "source_fragment" : "hdr.report_udp.dst_port = mon_port"
+            "source_fragment" : "hdr.report_udp.dport = mon_port"
           }
         },
         {
@@ -12661,7 +11680,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 76,
+            "line" : 77,
             "column" : 8,
             "source_fragment" : "hdr.report_udp.len = (bit<16>) UDP_HEADER_LEN + (bit<16>) REPORT_FIXED_HEADER_LEN + ..."
           }
@@ -12676,7 +11695,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 30,
+            "line" : 31,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.setValid()"
           }
@@ -12695,7 +11714,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.ver = 0"
           }
@@ -12714,7 +11733,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 145,
+            "line" : 153,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -12733,7 +11752,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 34,
+            "line" : 35,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.d = 0"
           }
@@ -12752,7 +11771,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 35,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.q = 0"
           }
@@ -12771,7 +11790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.f = 1"
           }
@@ -12790,7 +11809,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.rsvd = 0"
           }
@@ -12809,7 +11828,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 149,
+            "line" : 157,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -12828,7 +11847,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.seq_no = 0"
           }
@@ -12847,7 +11866,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 43,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.report_fixed_header.ingress_tstamp = (bit<32>) standard_metadata.enq_timestamp"
           }
@@ -12856,7 +11875,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 119,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12864,7 +11883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             },
             {
               "type" : "field",
@@ -12873,9 +11892,9 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 26,
+            "line" : 27,
             "column" : 8,
-            "source_fragment" : "hdr.udp.dst_port = hdr.intl4_tail.dest_port"
+            "source_fragment" : "hdr.udp.dport = hdr.intl4_tail.dest_port"
           }
         },
         {
@@ -12892,7 +11911,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 27,
+            "line" : 28,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.dscp = hdr.intl4_tail.dscp"
           }
@@ -12901,7 +11920,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 120,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12971,7 +11990,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 33,
+            "line" : 35,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len - len_bytes"
           }
@@ -13043,7 +12062,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 34,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.udp.len = hdr.udp.len - len_bytes"
           }
@@ -13058,7 +12077,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 36,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setInvalid()"
           }
@@ -13073,7 +12092,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 37,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_data.setInvalid()"
           }
@@ -13088,7 +12107,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 38,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setInvalid()"
           }
@@ -13103,7 +12122,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 39,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setInvalid()"
           }
@@ -13118,7 +12137,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 40,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setInvalid()"
           }
@@ -13133,7 +12152,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setInvalid()"
           }
@@ -13148,7 +12167,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 42,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setInvalid()"
           }
@@ -13163,7 +12182,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 43,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setInvalid()"
           }
@@ -13178,7 +12197,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 44,
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setInvalid()"
           }
@@ -13193,7 +12212,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setInvalid()"
           }
@@ -13208,7 +12227,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setInvalid()"
           }
@@ -13223,7 +12242,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setInvalid()"
           }
@@ -13231,68 +12250,302 @@
       ]
     },
     {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 121,
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 40,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
           "op" : "remove_header",
           "parameters" : [
             {
               "type" : "header",
-              "value" : "vlan_tag"
+              "value" : "mpls"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 41,
+            "filename" : "include/control/next.p4",
+            "line" : 246,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+            "source_fragment" : "hdr.mpls.setInvalid()"
           }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 122,
-      "runtime_data" : [],
-      "primitives" : [
+        },
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 248,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 107,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 253,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 255,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 256,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 257,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 108,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 266,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 267,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 269,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 109,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 280,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
           }
         },
         {
@@ -13305,7 +12558,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -13313,8 +12566,25 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 123,
+      "name" : "act_20",
+      "id" : 110,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_21",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13327,7 +12597,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 57,
+            "line" : 49,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -13346,7 +12616,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 58,
+            "line" : 50,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -13354,8 +12624,25 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 124,
+      "name" : "act_22",
+      "id" : 112,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_23",
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13363,7 +12650,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_24",
+      "id" : 114,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -13384,8 +12701,25 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 125,
+      "name" : "act_25",
+      "id" : 115,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_26",
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13393,7 +12727,218 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_27",
+      "id" : 117,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_28",
+      "id" : 118,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 323,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_29",
+      "id" : 119,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 329,
+            "column" : 45,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_30",
+      "id" : 120,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv6", "hop_limit"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv6", "hop_limit"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 328,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_31",
+      "id" : 121,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_32",
+      "id" : 122,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -13412,7 +12957,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 376,
+            "line" : 420,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -13420,8 +12965,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 126,
+      "name" : "act_33",
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13461,7 +13006,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 384,
+            "line" : 428,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
           }
@@ -13469,8 +13014,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 127,
+      "name" : "act_34",
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13510,7 +13055,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 381,
+            "line" : 425,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
           }
@@ -13518,8 +13063,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 128,
+      "name" : "act_35",
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13559,7 +13104,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 387,
+            "line" : 431,
             "column" : 12,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
           }
@@ -13567,8 +13112,8 @@
       ]
     },
     {
-      "name" : "act_37",
-      "id" : 129,
+      "name" : "act_36",
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13608,7 +13153,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 390,
+            "line" : 434,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
           }
@@ -13622,7 +13167,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -13638,14 +13183,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
+          "action_ids" : [42],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13661,14 +13206,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [41],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13684,14 +13229,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [45],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13707,14 +13252,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
+          "action_ids" : [43],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13730,14 +13275,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
+          "action_ids" : [44],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13753,14 +13298,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [46],
           "actions" : ["act_4"],
           "base_default_next" : null,
           "next_tables" : {
             "act_4" : null
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13776,14 +13321,158 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_13",
+          "action_ids" : [47],
+          "actions" : ["act_5"],
+          "base_default_next" : "node_14",
           "next_tables" : {
-            "act_12" : "node_13"
+            "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 47,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_6",
+          "id" : 7,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [48],
+          "actions" : ["act_6"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 48,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 51,
+            "column" : 10,
+            "source_fragment" : "ingress_port_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "vlan_is_valid",
+              "target" : ["vlan_tag", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [17, 18, 19],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+          "next_tables" : {
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
+          },
+          "default_entry" : {
+            "action_id" : 17,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.fwd_classifier",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 86,
+            "column" : 10,
+            "source_fragment" : "fwd_classifier"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_dst",
+              "target" : ["ethernet", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [20],
+          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
+          "base_default_next" : "tbl_act_7",
+          "next_tables" : {
+            "FabricIngress.filtering.set_forwarding_type" : "tbl_act_7"
+          },
+          "default_entry" : {
+            "action_id" : 20,
+            "action_const" : true,
+            "action_data" : ["0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 10,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [57],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "act_15" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13791,17 +13480,17 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
-          "id" : 7,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 79,
+            "line" : 82,
             "column" : 10,
             "source_fragment" : "s1u_filter_table"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "gtpu_ipv4.dst_addr",
+              "name" : "gtp_ipv4_dst",
               "target" : ["gtpu_ipv4", "dst_addr"],
               "mask" : null
             }
@@ -13813,22 +13502,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [1],
-          "actions" : ["NoAction"],
+          "actions" : ["nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_6",
-            "__MISS__" : "tbl_act_7"
+            "__HIT__" : "tbl_act_8",
+            "__MISS__" : "tbl_act_9"
           },
           "default_entry" : {
             "action_id" : 1,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 8,
+          "name" : "tbl_act_8",
+          "id" : 12,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13837,10 +13526,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [49],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_17",
+          "actions" : ["act_7"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_5" : "node_17"
+            "act_7" : "node_23"
           },
           "default_entry" : {
             "action_id" : 49,
@@ -13850,8 +13539,8 @@
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 9,
+          "name" : "tbl_act_9",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13860,10 +13549,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [50],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_17",
+          "actions" : ["act_8"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_17"
+            "act_8" : "node_23"
           },
           "default_entry" : {
             "action_id" : 50,
@@ -13873,31 +13562,8 @@
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 10,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [12],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_8",
-          "next_tables" : {
-            "drop_now" : "tbl_act_8"
-          },
-          "default_entry" : {
-            "action_id" : 12,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 11,
+          "name" : "tbl_act_10",
+          "id" : 14,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13906,10 +13572,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [51],
-          "actions" : ["act_7"],
-          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
+          "actions" : ["act_9"],
+          "base_default_next" : "tbl_act_11",
           "next_tables" : {
-            "act_7" : "tbl_spgw_ingress_gtpu_decap"
+            "act_9" : "tbl_act_11"
           },
           "default_entry" : {
             "action_id" : 51,
@@ -13919,8 +13585,31 @@
           }
         },
         {
+          "name" : "tbl_act_11",
+          "id" : 15,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [52],
+          "actions" : ["act_10"],
+          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
+          "next_tables" : {
+            "act_10" : "tbl_spgw_ingress_gtpu_decap"
+          },
+          "default_entry" : {
+            "action_id" : 52,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_spgw_ingress_gtpu_decap",
-          "id" : 12,
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13930,9 +13619,9 @@
           "direct_meters" : null,
           "action_ids" : [13],
           "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
-          "base_default_next" : "node_27",
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
+            "FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
           },
           "default_entry" : {
             "action_id" : 13,
@@ -13943,17 +13632,17 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
-          "id" : 13,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 68,
+            "line" : 69,
             "column" : 10,
             "source_fragment" : "dl_sess_lookup"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -13965,45 +13654,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [14, 0],
-          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
+          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
+            "__HIT__" : "tbl_act_12",
+            "__MISS__" : "tbl_act_13"
           },
           "default_entry" : {
             "action_id" : 0,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 14,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_8" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 15,
+          "name" : "tbl_act_12",
+          "id" : 18,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14012,10 +13678,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [53],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_24",
+          "actions" : ["act_11"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "act_9" : "node_24"
+            "act_11" : "node_30"
           },
           "default_entry" : {
             "action_id" : 53,
@@ -14025,8 +13691,8 @@
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 16,
+          "name" : "tbl_act_13",
+          "id" : 19,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14035,10 +13701,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [54],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_27",
+          "actions" : ["act_12"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "act_10" : "node_27"
+            "act_12" : "node_30"
           },
           "default_entry" : {
             "action_id" : 54,
@@ -14048,101 +13714,6 @@
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_11" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 55,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
-          "id" : 18,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [57],
-          "actions" : ["act_13"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
-          "next_tables" : {
-            "act_13" : "FabricIngress.filtering.ingress_port_vlan"
-          },
-          "default_entry" : {
-            "action_id" : 57,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 66,
-            "column" : 10,
-            "source_fragment" : "ingress_port_vlan"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.is_valid",
-              "target" : ["vlan_tag", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [19, 18, 17, 20],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_14",
-            "__MISS__" : "tbl_act_15"
-          },
-          "default_entry" : {
-            "action_id" : 19,
-            "action_const" : true,
-            "action_data" : ["0xffe"],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_14",
           "id" : 20,
           "key" : [],
@@ -14152,14 +13723,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_32",
+          "action_ids" : [55],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_14" : "node_32"
+            "act_13" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14175,70 +13746,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_32",
+          "action_ids" : [56],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_15" : "node_32"
+            "act_14" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 22,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 103,
-            "column" : 10,
-            "source_fragment" : "fwd_classifier"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
-              "target" : ["ethernet", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [21],
-          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 21,
-            "action_const" : true,
-            "action_data" : ["0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_16",
-          "id" : 23,
+          "id" : 22,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14246,14 +13769,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
+          "action_ids" : [58],
           "actions" : ["act_16"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "act_16" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14261,23 +13784,23 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 24,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 10,
             "source_fragment" : "bridging"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -14288,34 +13811,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 4],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [21, 4],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 4,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 25,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "mpls"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.mpls.label",
-              "target" : ["mpls", "label"],
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
               "mask" : null
             }
           ],
@@ -14325,38 +13848,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 5],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_17",
+          "action_ids" : [22, 5],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_17",
-            "NoAction" : "tbl_act_17"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 5,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_17",
-          "id" : 26,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_17"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_17" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14364,17 +13864,17 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 27,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 91,
+            "line" : 93,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -14385,34 +13885,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [24, 25, 6],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [23, 24, 6],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
-            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 6,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.routing_v6",
-          "id" : 28,
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 178,
+            "line" : 117,
             "column" : 10,
             "source_fragment" : "routing_v6"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv6.dst_addr",
+              "name" : "ipv6_dst",
               "target" : ["ipv6", "dst_addr"],
               "mask" : null
             }
@@ -14423,99 +13923,99 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31, 7],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [25, 7],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v6" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v6" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 7,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 29,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 27,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 136,
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
             "column" : 10,
             "source_fragment" : "acl"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.ip_proto",
+              "name" : "ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_src",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.src_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_type",
+              "name" : "icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_code",
+              "name" : "icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -14527,14 +14027,14 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [26, 27, 28, 29, 30],
-          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_18",
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_45",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_18",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.drop" : "tbl_act_18",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_18"
+            "FabricIngress.acl.set_next_id_acl" : "node_45",
+            "FabricIngress.acl.punt_to_cpu" : "node_45",
+            "FabricIngress.acl.clone_to_cpu" : "node_45",
+            "FabricIngress.acl.drop" : "node_45",
+            "FabricIngress.acl.nop_acl" : "node_45"
           },
           "default_entry" : {
             "action_id" : 30,
@@ -14544,78 +14044,62 @@
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 30,
-          "key" : [],
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
           "match_type" : "exact",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : false,
+          "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_18"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [32, 33, 9],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
-            "act_18" : "FabricIngress.next.vlan_meta"
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.simple",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.simple",
+            "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 31,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 65,
-            "column" : 10,
-            "source_fragment" : "vlan_meta"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [32, 11],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "FabricIngress.next.simple",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "FabricIngress.next.simple",
-            "nop" : "FabricIngress.next.simple"
-          },
-          "default_entry" : {
-            "action_id" : 11,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
           "name" : "FabricIngress.next.simple",
-          "id" : 32,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 122,
+            "line" : 141,
             "column" : 10,
             "source_fragment" : "simple"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
+              "name" : "next_id",
               "target" : ["scalars", "fabric_metadata_t.next_id"],
               "mask" : null
             }
@@ -14626,22 +14110,132 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33, 34, 35, 36, 37, 38, 8],
-          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
-          "base_default_next" : null,
+          "action_ids" : [34, 35, 36, 10],
+          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
-            "__HIT__" : "tbl_act_19",
-            "__MISS__" : "tbl_act_20"
+            "FabricIngress.next.output_simple" : "FabricIngress.next.hashed",
+            "FabricIngress.next.routing_simple" : "FabricIngress.next.hashed",
+            "FabricIngress.next.mpls_routing_simple" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 8,
-            "action_const" : false,
+            "action_id" : 10,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
+          "name" : "FabricIngress.next.hashed",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 180,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [37, 38, 39, 11],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
+          "id" : 31,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [40, 12],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 12,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 32,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [31, 8],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_51",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_51",
+            "nop" : "node_51"
+          },
+          "default_entry" : {
+            "action_id" : 8,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
           "id" : 33,
           "key" : [],
           "match_type" : "exact",
@@ -14650,21 +14244,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_50",
+          "action_ids" : [59],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_53",
           "next_tables" : {
-            "act_19" : "node_50"
+            "act_17" : "node_53"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
+          "name" : "tbl_act_18",
           "id" : 34,
           "key" : [],
           "match_type" : "exact",
@@ -14673,290 +14267,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_50",
-          "next_tables" : {
-            "act_20" : "node_50"
-          },
-          "default_entry" : {
-            "action_id" : 64,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 35,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 175,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "FabricIngress.next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [39, 40, 41, 9],
-          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_21",
-            "__MISS__" : "tbl_act_22"
-          }
-        },
-        {
-          "name" : "tbl_act_21",
-          "id" : 36,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_54",
-          "next_tables" : {
-            "act_21" : "node_54"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_22",
-          "id" : 37,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_54",
-          "next_tables" : {
-            "act_22" : "node_54"
-          },
-          "default_entry" : {
-            "action_id" : 66,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 38,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 207,
-            "column" : 10,
-            "source_fragment" : "multicast"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42, 10],
-          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_23",
-            "__MISS__" : "tbl_act_24"
-          },
-          "default_entry" : {
-            "action_id" : 10,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_23",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_58",
-          "next_tables" : {
-            "act_23" : "node_58"
-          },
-          "default_entry" : {
-            "action_id" : 67,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_24",
-          "id" : 40,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_58",
-          "next_tables" : {
-            "act_24" : "node_58"
-          },
-          "default_entry" : {
-            "action_id" : 68,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_25",
-          "id" : 41,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [69],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_60",
-          "next_tables" : {
-            "act_25" : "node_60"
-          },
-          "default_entry" : {
-            "action_id" : 69,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_26",
-          "id" : 42,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [70],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_66",
-          "next_tables" : {
-            "act_26" : "node_66"
-          },
-          "default_entry" : {
-            "action_id" : 70,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_27",
-          "id" : 43,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_66",
-          "next_tables" : {
-            "act_27" : "node_66"
-          },
-          "default_entry" : {
-            "action_id" : 71,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_28",
-          "id" : 44,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [72],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_68",
-          "next_tables" : {
-            "act_28" : "node_68"
-          },
-          "default_entry" : {
-            "action_id" : 72,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_29",
-          "id" : 45,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_29"],
+          "action_ids" : [60],
+          "actions" : ["act_18"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_29" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_18" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 73,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14964,7 +14282,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 46,
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -14974,7 +14292,7 @@
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             }
@@ -14986,32 +14304,32 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [15, 2],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
             "FabricIngress.process_set_source_sink.int_set_source" : "FabricIngress.process_set_source_sink.tb_set_sink",
-            "NoAction" : "FabricIngress.process_set_source_sink.tb_set_sink"
+            "nop" : "FabricIngress.process_set_source_sink.tb_set_sink"
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 47,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "tb_set_sink"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_spec",
+              "name" : "eg_spec",
               "target" : ["standard_metadata", "egress_spec"],
               "mask" : null
             }
@@ -15023,22 +14341,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [16, 3],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"],
-          "base_default_next" : "node_72",
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
+          "base_default_next" : "node_57",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_72",
-            "NoAction" : "node_72"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_57",
+            "nop" : "node_57"
           },
           "default_entry" : {
             "action_id" : 3,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 48,
+          "name" : "tbl_act_19",
+          "id" : 37,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15046,14 +14364,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_30"],
+          "action_ids" : [61],
+          "actions" : ["act_19"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_30" : null
+            "act_19" : null
           },
           "default_entry" : {
-            "action_id" : 74,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15062,13 +14380,13 @@
       ],
       "action_profiles" : [
         {
-          "name" : "FabricIngress.next.ecmp_selector",
+          "name" : "FabricIngress.next.hashed_selector",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 145,
+            "line" : 161,
             "column" : 55,
-            "source_fragment" : "ecmp_selector"
+            "source_fragment" : "hashed_selector"
           },
           "max_size" : 64,
           "selector" : {
@@ -15088,11 +14406,11 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
               }
             ]
           }
@@ -15144,7 +14462,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+                    "value" : ["scalars", "spgw_normalizer_hasReturned"]
                   }
                 }
               }
@@ -15181,7 +14499,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -15197,14 +14515,67 @@
             }
           },
           "true_next" : "tbl_act_4",
-          "false_next" : "tbl_act_5"
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_13",
+          "name" : "node_12",
           "id" : 4,
           "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 102,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["vlan_tag", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_5",
+          "false_next" : "node_14"
+        },
+        {
+          "name" : "node_14",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_6",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+        },
+        {
+          "name" : "node_19",
+          "id" : 6,
+          "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 139,
+            "line" : 143,
             "column" : 12,
             "source_fragment" : "gtpu.isValid()"
           },
@@ -15223,11 +14594,11 @@
           "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
         },
         {
-          "name" : "node_17",
-          "id" : 5,
+          "name" : "node_23",
+          "id" : 7,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 143,
+            "line" : 147,
             "column" : 16,
             "source_fragment" : "!s1u_filter_table.apply().hit"
           },
@@ -15243,18 +14614,18 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_tmp_1"]
+                    "value" : ["scalars", "spgw_ingress_tmp"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_drop_now",
-          "false_next" : "tbl_act_8"
+          "true_next" : "tbl_act_10",
+          "false_next" : "tbl_act_11"
         },
         {
-          "name" : "node_24",
-          "id" : 6,
+          "name" : "node_30",
+          "id" : 8,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15262,16 +14633,16 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "spgw_ingress_tmp_2"]
+                "value" : ["scalars", "spgw_ingress_tmp_0"]
               }
             }
           },
-          "true_next" : "tbl_act_11",
-          "false_next" : "tbl_act_12"
+          "true_next" : "tbl_act_14",
+          "false_next" : "tbl_act_15"
         },
         {
-          "name" : "node_27",
-          "id" : 7,
+          "name" : "node_33",
+          "id" : 9,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15284,39 +14655,55 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+                    "value" : ["scalars", "spgw_ingress_hasReturned"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
-        },
-        {
-          "name" : "node_32",
-          "id" : 8,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "filtering_tmp_0"]
-              }
-            }
-          },
-          "true_next" : "FabricIngress.filtering.fwd_classifier",
-          "false_next" : "tbl_act_16"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_35"
         },
         {
           "name" : "node_35",
-          "id" : 9,
+          "id" : 10,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_36",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_36",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 191,
-            "column" : 11,
+            "line" : 131,
+            "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
           "expression" : {
@@ -15334,14 +14721,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_37"
+          "false_next" : "node_38"
         },
         {
-          "name" : "node_37",
-          "id" : 10,
+          "name" : "node_38",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 192,
+            "line" : 132,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -15364,10 +14751,10 @@
         },
         {
           "name" : "node_40",
-          "id" : 11,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 198,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -15390,10 +14777,10 @@
         },
         {
           "name" : "node_42",
-          "id" : 12,
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 200,
+            "line" : 135,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
           },
@@ -15412,204 +14799,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v6",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_50",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 219,
-            "column" : 12,
-            "source_fragment" : "!simple.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_4"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_60"
-        },
-        {
-          "name" : "node_54",
-          "id" : 14,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 220,
-            "column" : 16,
-            "source_fragment" : "!hashed.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_3"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_60"
-        },
-        {
-          "name" : "node_58",
+          "name" : "node_45",
           "id" : 15,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 221,
-            "column" : 20,
-            "source_fragment" : "!multicast.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_2"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_60"
-        },
-        {
-          "name" : "node_60",
-          "id" : 16,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_hasReturned_0"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_61",
-          "false_next" : "node_66"
-        },
-        {
-          "name" : "node_61",
-          "id" : 17,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
+            "filename" : "fabric.p4",
+            "line" : 70,
             "column" : 12,
-            "source_fragment" : "!hdr.mpls.isValid()"
+            "source_fragment" : "fabric_metadata.skip_next == false"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
+              "op" : "==",
+              "left" : {
                 "type" : "expression",
                 "value" : {
                   "op" : "d2b",
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["mpls", "$valid$"]
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
                   }
                 }
-              }
-            }
-          },
-          "true_next" : "node_62",
-          "false_next" : "node_66"
-        },
-        {
-          "name" : "node_62",
-          "id" : 18,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 229,
-            "column" : 15,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
+              },
               "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
+                "type" : "bool",
+                "value" : false
               }
             }
           },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_64"
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_64",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 233,
-            "column" : 21,
-            "source_fragment" : "hdr.ipv6.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv6", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_66"
-        },
-        {
-          "name" : "node_66",
-          "id" : 20,
+          "name" : "node_51",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -15627,15 +14857,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
-          "false_next" : "node_68"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_53"
         },
         {
-          "name" : "node_68",
-          "id" : 21,
+          "name" : "node_53",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -15653,15 +14883,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_29",
+          "true_next" : "tbl_act_18",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_72",
-          "id" : 22,
+          "name" : "node_57",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 82,
+            "line" : 86,
             "column" : 11,
             "source_fragment" : "fabric_metadata.int_meta.sink == true"
           },
@@ -15687,7 +14917,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_30"
+          "true_next" : "tbl_act_19"
         }
       ]
     },
@@ -15696,15 +14926,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_76",
+      "init_table" : "node_61",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 49,
+          "name" : "tbl_act_20",
+          "id" : 38,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15712,22 +14942,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [121],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_80",
+          "action_ids" : [110],
+          "actions" : ["act_20"],
+          "base_default_next" : "tbl_act_21",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_80"
+            "act_20" : "tbl_act_21"
           },
           "default_entry" : {
-            "action_id" : 121,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 50,
+          "name" : "tbl_act_21",
+          "id" : 39,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15735,45 +14965,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [81],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_31",
-          "next_tables" : {
-            "drop_now" : "tbl_act_31"
-          },
-          "default_entry" : {
-            "action_id" : 81,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_31",
-          "id" : 51,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [123],
-          "actions" : ["act_31"],
+          "action_ids" : [111],
+          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_31" : null
+            "act_21" : null
           },
           "default_entry" : {
-            "action_id" : 123,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_1",
-          "id" : 52,
+          "name" : "tbl_act_22",
+          "id" : 40,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15781,14 +14988,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [82],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [112],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_22" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 82,
+            "action_id" : 112,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 41,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [106],
+          "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 106,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 42,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [107],
+          "actions" : ["FabricEgress.egress_next.set_mpls"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15796,23 +15049,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 53,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 258,
+            "line" : 285,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_port",
+              "name" : "eg_port",
               "target" : ["standard_metadata", "egress_port"],
               "mask" : null
             }
@@ -15823,23 +15076,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [122, 80],
+          "action_ids" : [109, 65],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_86",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_86",
-            "nop" : "node_86"
+            "__HIT__" : "tbl_act_23",
+            "__MISS__" : "tbl_act_24"
           },
           "default_entry" : {
-            "action_id" : 80,
-            "action_const" : false,
+            "action_id" : 65,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 54,
+          "name" : "tbl_act_23",
+          "id" : 44,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15847,14 +15100,221 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_88",
+          "action_ids" : [113],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_75",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_88"
+            "act_23" : "node_75"
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 113,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_24",
+          "id" : 45,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [114],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_75",
+          "next_tables" : {
+            "act_24" : "node_75"
+          },
+          "default_entry" : {
+            "action_id" : 114,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 46,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [108],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_78",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_78"
+          },
+          "default_entry" : {
+            "action_id" : 108,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_25",
+          "id" : 47,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [116],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_80",
+          "next_tables" : {
+            "act_26" : "node_80"
+          },
+          "default_entry" : {
+            "action_id" : 116,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_26",
+          "id" : 48,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [115],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_90",
+          "next_tables" : {
+            "act_25" : "node_90"
+          },
+          "default_entry" : {
+            "action_id" : 115,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_27",
+          "id" : 49,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [118],
+          "actions" : ["act_28"],
+          "base_default_next" : "node_84",
+          "next_tables" : {
+            "act_28" : "node_84"
+          },
+          "default_entry" : {
+            "action_id" : 118,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_28",
+          "id" : 50,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [117],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_90",
+          "next_tables" : {
+            "act_27" : "node_90"
+          },
+          "default_entry" : {
+            "action_id" : 117,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_29",
+          "id" : 51,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [120],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_88",
+          "next_tables" : {
+            "act_30" : "node_88"
+          },
+          "default_entry" : {
+            "action_id" : 120,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_30",
+          "id" : 52,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [119],
+          "actions" : ["act_29"],
+          "base_default_next" : "node_90",
+          "next_tables" : {
+            "act_29" : "node_90"
+          },
+          "default_entry" : {
+            "action_id" : 119,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_egress_gtpu_encap",
+          "id" : 53,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [68],
+          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
+          "base_default_next" : "node_92",
+          "next_tables" : {
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_92"
+          },
+          "default_entry" : {
+            "action_id" : 68,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15862,36 +15322,36 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 55,
+          "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 65,
+            "line" : 66,
             "column" : 10,
             "source_fragment" : "tb_int_source"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             }
           ],
@@ -15901,23 +15361,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84, 75],
-          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_91",
+          "action_ids" : [69, 62],
+          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
+          "base_default_next" : "node_95",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_91",
-            "NoAction" : "node_91"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_95",
+            "nop" : "node_95"
           },
           "default_entry" : {
-            "action_id" : 75,
-            "action_const" : false,
+            "action_id" : 62,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 56,
+          "name" : "tbl_act_31",
+          "id" : 55,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15925,14 +15385,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [124],
-          "actions" : ["act_32"],
+          "action_ids" : [121],
+          "actions" : ["act_31"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_32" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_31" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 124,
+            "action_id" : 121,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15940,17 +15400,17 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 57,
+          "id" : 56,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 271,
+            "line" : 315,
             "column" : 10,
             "source_fragment" : "tb_int_insert"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.int_header.is_valid",
+              "name" : "int_is_valid",
               "target" : ["int_header", "$valid$"],
               "mask" : null
             }
@@ -15961,23 +15421,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85, 79],
+          "action_ids" : [70, 63],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_94",
+          "base_default_next" : "node_98",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_94",
-            "nop" : "node_94"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_98",
+            "nop" : "node_98"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 58,
+          "name" : "tbl_act_32",
+          "id" : 57,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15985,14 +15445,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [125],
-          "actions" : ["act_33"],
-          "base_default_next" : "node_96",
+          "action_ids" : [122],
+          "actions" : ["act_32"],
+          "base_default_next" : "node_100",
           "next_tables" : {
-            "act_33" : "node_96"
+            "act_32" : "node_100"
           },
           "default_entry" : {
-            "action_id" : 125,
+            "action_id" : 122,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16000,10 +15460,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 59,
+          "id" : 58,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 286,
+            "line" : 331,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0003"
           },
@@ -16021,7 +15481,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 76],
+          "action_ids" : [71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 66],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -16044,7 +15504,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 66,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16053,7 +15513,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 310,
+                "line" : 354,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0003_i0()"
               },
@@ -16064,7 +15524,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 1
@@ -16072,7 +15532,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 311,
+                "line" : 355,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0003_i1()"
               },
@@ -16083,7 +15543,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 2
@@ -16091,7 +15551,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 312,
+                "line" : 356,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0003_i2()"
               },
@@ -16102,7 +15562,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 3
@@ -16110,7 +15570,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 313,
+                "line" : 357,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0003_i3()"
               },
@@ -16121,7 +15581,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 4
@@ -16129,7 +15589,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 314,
+                "line" : 358,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0003_i4()"
               },
@@ -16140,7 +15600,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 5
@@ -16148,7 +15608,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 315,
+                "line" : 359,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0003_i5()"
               },
@@ -16159,7 +15619,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 6
@@ -16167,7 +15627,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 316,
+                "line" : 360,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0003_i6()"
               },
@@ -16178,7 +15638,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 7
@@ -16186,7 +15646,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 317,
+                "line" : 361,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0003_i7()"
               },
@@ -16197,7 +15657,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 93,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 8
@@ -16205,7 +15665,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 318,
+                "line" : 362,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0003_i8()"
               },
@@ -16216,7 +15676,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 94,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 9
@@ -16224,7 +15684,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 319,
+                "line" : 363,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0003_i9()"
               },
@@ -16235,7 +15695,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 95,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 10
@@ -16243,7 +15703,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 320,
+                "line" : 364,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0003_i10()"
               },
@@ -16254,7 +15714,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 11
@@ -16262,7 +15722,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 321,
+                "line" : 365,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0003_i11()"
               },
@@ -16273,7 +15733,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 12
@@ -16281,7 +15741,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 322,
+                "line" : 366,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0003_i12()"
               },
@@ -16292,7 +15752,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 13
@@ -16300,7 +15760,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 323,
+                "line" : 367,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0003_i13()"
               },
@@ -16311,7 +15771,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 14
@@ -16319,7 +15779,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 324,
+                "line" : 368,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0003_i14()"
               },
@@ -16330,7 +15790,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 15
@@ -16338,7 +15798,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 325,
+                "line" : 369,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0003_i15()"
               },
@@ -16349,7 +15809,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 16
@@ -16358,10 +15818,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 60,
+          "id" : 59,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 330,
+            "line" : 375,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0407"
           },
@@ -16379,30 +15839,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 77],
+          "action_ids" : [87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 67],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_34",
+          "base_default_next" : "tbl_act_33",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_34",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_34",
-            "NoAction" : "tbl_act_34"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_33",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_33",
+            "NoAction" : "tbl_act_33"
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 67,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16411,7 +15871,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 354,
+                "line" : 398,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0407_i0()"
               },
@@ -16422,7 +15882,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 1
@@ -16430,7 +15890,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 355,
+                "line" : 399,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0407_i1()"
               },
@@ -16441,7 +15901,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 103,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 2
@@ -16449,7 +15909,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 356,
+                "line" : 400,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0407_i2()"
               },
@@ -16460,7 +15920,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 3
@@ -16468,7 +15928,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 357,
+                "line" : 401,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0407_i3()"
               },
@@ -16479,7 +15939,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 4
@@ -16487,7 +15947,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 358,
+                "line" : 402,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0407_i4()"
               },
@@ -16498,7 +15958,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 5
@@ -16506,7 +15966,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 359,
+                "line" : 403,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0407_i5()"
               },
@@ -16517,7 +15977,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 6
@@ -16525,7 +15985,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 360,
+                "line" : 404,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0407_i6()"
               },
@@ -16536,7 +15996,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 93,
                 "action_data" : []
               },
               "priority" : 7
@@ -16544,7 +16004,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 361,
+                "line" : 405,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0407_i7()"
               },
@@ -16555,7 +16015,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 94,
                 "action_data" : []
               },
               "priority" : 8
@@ -16563,7 +16023,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 362,
+                "line" : 406,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0407_i8()"
               },
@@ -16574,7 +16034,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 95,
                 "action_data" : []
               },
               "priority" : 9
@@ -16582,7 +16042,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 363,
+                "line" : 407,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0407_i9()"
               },
@@ -16593,7 +16053,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 111,
+                "action_id" : 96,
                 "action_data" : []
               },
               "priority" : 10
@@ -16601,7 +16061,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 364,
+                "line" : 408,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0407_i10()"
               },
@@ -16612,7 +16072,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 112,
+                "action_id" : 97,
                 "action_data" : []
               },
               "priority" : 11
@@ -16620,7 +16080,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 365,
+                "line" : 409,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0407_i11()"
               },
@@ -16631,7 +16091,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 113,
+                "action_id" : 98,
                 "action_data" : []
               },
               "priority" : 12
@@ -16639,7 +16099,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 366,
+                "line" : 410,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0407_i12()"
               },
@@ -16650,7 +16110,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 114,
+                "action_id" : 99,
                 "action_data" : []
               },
               "priority" : 13
@@ -16658,7 +16118,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 367,
+                "line" : 411,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0407_i13()"
               },
@@ -16669,7 +16129,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 115,
+                "action_id" : 100,
                 "action_data" : []
               },
               "priority" : 14
@@ -16677,7 +16137,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 368,
+                "line" : 412,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0407_i14()"
               },
@@ -16688,7 +16148,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 116,
+                "action_id" : 101,
                 "action_data" : []
               },
               "priority" : 15
@@ -16696,7 +16156,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 369,
+                "line" : 413,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0407_i15()"
               },
@@ -16707,7 +16167,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 117,
+                "action_id" : 102,
                 "action_data" : []
               },
               "priority" : 16
@@ -16715,6 +16175,29 @@
           ]
         },
         {
+          "name" : "tbl_act_33",
+          "id" : 60,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [124],
+          "actions" : ["act_34"],
+          "base_default_next" : "node_104",
+          "next_tables" : {
+            "act_34" : "node_104"
+          },
+          "default_entry" : {
+            "action_id" : 124,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_34",
           "id" : 61,
           "key" : [],
@@ -16724,14 +16207,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [127],
-          "actions" : ["act_35"],
-          "base_default_next" : "node_100",
+          "action_ids" : [123],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_106",
           "next_tables" : {
-            "act_35" : "node_100"
+            "act_33" : "node_106"
           },
           "default_entry" : {
-            "action_id" : 127,
+            "action_id" : 123,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16747,14 +16230,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [126],
-          "actions" : ["act_34"],
-          "base_default_next" : "node_102",
+          "action_ids" : [125],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_108",
           "next_tables" : {
-            "act_34" : "node_102"
+            "act_35" : "node_108"
           },
           "default_entry" : {
-            "action_id" : 126,
+            "action_id" : 125,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16770,37 +16253,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [128],
+          "action_ids" : [126],
           "actions" : ["act_36"],
-          "base_default_next" : "node_104",
+          "base_default_next" : "node_110",
           "next_tables" : {
-            "act_36" : "node_104"
+            "act_36" : "node_110"
           },
           "default_entry" : {
-            "action_id" : 128,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_37",
-          "id" : 64,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [129],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_106",
-          "next_tables" : {
-            "act_37" : "node_106"
-          },
-          "default_entry" : {
-            "action_id" : 129,
+            "action_id" : 126,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16808,10 +16268,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 65,
+          "id" : 64,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
-            "line" : 85,
+            "line" : 86,
             "column" : 10,
             "source_fragment" : "tb_generate_report"
           },
@@ -16822,15 +16282,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [118, 78],
-          "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "NoAction"],
-          "base_default_next" : "node_108",
+          "action_ids" : [103, 64],
+          "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
+          "base_default_next" : "node_112",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_108",
-            "NoAction" : "node_108"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_112",
+            "nop" : "node_112"
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 64,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16838,6 +16298,29 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
+          "id" : 65,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [104],
+          "actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
+          "base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
+          "next_tables" : {
+            "FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
+          },
+          "default_entry" : {
+            "action_id" : 104,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_process_int_main_process_int_sink_int_sink",
           "id" : 66,
           "key" : [],
           "match_type" : "exact",
@@ -16846,37 +16329,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [119],
-          "actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
-          "base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
-          "next_tables" : {
-            "FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
-          },
-          "default_entry" : {
-            "action_id" : 119,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 67,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [120],
+          "action_ids" : [105],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 120,
+            "action_id" : 105,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16886,11 +16346,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_76",
-          "id" : 23,
+          "name" : "node_61",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -16916,14 +16376,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_77"
+          "false_next" : "node_62"
         },
         {
-          "name" : "node_77",
-          "id" : 24,
+          "name" : "node_62",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -16941,65 +16401,15 @@
               }
             }
           },
-          "true_next" : "node_78",
-          "false_next" : "node_83"
+          "true_next" : "node_63",
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_78",
-          "id" : 25,
+          "name" : "node_63",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["vlan_tag", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_80"
-        },
-        {
-          "name" : "node_80",
-          "id" : 26,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -17051,15 +16461,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
-          "false_next" : "tbl_act_31"
+          "true_next" : "tbl_act_20",
+          "false_next" : "tbl_act_21"
         },
         {
-          "name" : "node_83",
-          "id" : 27,
+          "name" : "node_66",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -17104,17 +16514,269 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_1",
+          "true_next" : "tbl_act_22",
+          "false_next" : "node_68"
+        },
+        {
+          "name" : "node_68",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 304,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_69",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_69",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 305,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_86",
+          "name" : "node_75",
+          "id" : 25,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_76",
+          "false_next" : "node_78"
+        },
+        {
+          "name" : "node_76",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_78"
+        },
+        {
+          "name" : "node_78",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 318,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_25",
+          "false_next" : "node_82"
+        },
+        {
+          "name" : "node_80",
           "id" : 28,
           "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_26",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_82",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 322,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_86"
+        },
+        {
+          "name" : "node_84",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_28",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_86",
+          "id" : 31,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 21,
+            "source_fragment" : "hdr.ipv6.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv6", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_29",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_88",
+          "id" : 32,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 329,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv6.hop_limit == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv6", "hop_limit"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_30",
+          "false_next" : "node_90"
+        },
+        {
+          "name" : "node_90",
+          "id" : 33,
+          "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 221,
+            "line" : 226,
             "column" : 12,
-            "source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK"
+            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
           },
           "expression" : {
             "type" : "expression",
@@ -17131,14 +16793,14 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_88"
+          "false_next" : "node_92"
         },
         {
-          "name" : "node_88",
-          "id" : 29,
+          "name" : "node_92",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 98,
+            "line" : 102,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port != 255 && ..."
           },
@@ -17211,14 +16873,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_89"
+          "true_next" : "node_93"
         },
         {
-          "name" : "node_89",
-          "id" : 30,
+          "name" : "node_93",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 102,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "fabric_metadata.int_meta.source == true"
           },
@@ -17244,14 +16906,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_91"
+          "false_next" : "node_95"
         },
         {
-          "name" : "node_91",
-          "id" : 31,
+          "name" : "node_95",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 106,
+            "line" : 110,
             "column" : 15,
             "source_fragment" : "hdr.int_header.isValid()"
           },
@@ -17267,14 +16929,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_32"
+          "true_next" : "tbl_act_31"
         },
         {
-          "name" : "node_94",
-          "id" : 32,
+          "name" : "node_98",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 375,
+            "line" : 419,
             "column" : 12,
             "source_fragment" : "fmeta.int_meta.transit == false"
           },
@@ -17299,12 +16961,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_96"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_100"
         },
         {
-          "name" : "node_96",
-          "id" : 33,
+          "name" : "node_100",
+          "id" : 38,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -17317,21 +16979,21 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
                   }
                 }
               }
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_106"
+          "false_next" : "node_110"
         },
         {
-          "name" : "node_100",
-          "id" : 34,
+          "name" : "node_104",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 383,
+            "line" : 427,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -17346,15 +17008,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_35",
-          "false_next" : "node_102"
+          "true_next" : "tbl_act_34",
+          "false_next" : "node_106"
         },
         {
-          "name" : "node_102",
-          "id" : 35,
+          "name" : "node_106",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 386,
+            "line" : 430,
             "column" : 12,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -17369,15 +17031,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_36",
-          "false_next" : "node_104"
+          "true_next" : "tbl_act_35",
+          "false_next" : "node_108"
         },
         {
-          "name" : "node_104",
-          "id" : 36,
+          "name" : "node_108",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 389,
+            "line" : 433,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.isValid()"
           },
@@ -17392,15 +17054,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_106"
+          "true_next" : "tbl_act_36",
+          "false_next" : "node_110"
         },
         {
-          "name" : "node_106",
-          "id" : 37,
+          "name" : "node_110",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 111,
+            "line" : 115,
             "column" : 20,
             "source_fragment" : "standard_metadata.instance_type == 1"
           },
@@ -17419,14 +17081,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_108"
+          "false_next" : "node_112"
         },
         {
-          "name" : "node_108",
-          "id" : 38,
+          "name" : "node_112",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 115,
+            "line" : 119,
             "column" : 20,
             "source_fragment" : "fabric_metadata.int_meta.sink == true"
           },
@@ -17487,7 +17149,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 943fb1c1..f1e2a31 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -6,7 +6,7 @@
   }
   match_fields {
     id: 1
-    name: "ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: EXACT
   }
@@ -14,12 +14,12 @@
     id: 16804065
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318781522
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -29,15 +29,15 @@
   }
   match_fields {
     id: 1
-    name: "gtpu_ipv4.dst_addr"
+    name: "gtp_ipv4_dst"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800567
+    id: 16819938
   }
+  const_default_action_id: 16819938
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -47,7 +47,7 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -55,12 +55,12 @@
     id: 16778827
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318787614
   size: 511
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -70,7 +70,7 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.egress_spec"
+    name: "eg_spec"
     bitwidth: 9
     match_type: EXACT
   }
@@ -78,12 +78,12 @@
     id: 16788951
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318770551
   size: 511
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -93,38 +93,34 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.vlan_tag.is_valid"
+    name: "vlan_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   action_refs {
-    id: 16835546
+    id: 16836487
   }
   action_refs {
-    id: 16793253
+    id: 16818236
   }
   action_refs {
-    id: 16798734
+    id: 16794911
   }
-  action_refs {
-    id: 16833700
-  }
-  const_default_action_id: 16835546
+  const_default_action_id: 16836487
   direct_resource_ids: 318815501
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -134,19 +130,19 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: EXACT
   }
@@ -156,7 +152,6 @@
   const_default_action_id: 16840921
   direct_resource_ids: 318827326
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -166,13 +161,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
@@ -180,12 +175,12 @@
     id: 16811012
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318770289
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -195,7 +190,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.mpls.label"
+    name: "mpls_label"
     bitwidth: 20
     match_type: EXACT
   }
@@ -203,12 +198,12 @@
     id: 16827758
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318830507
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -218,7 +213,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: LPM
   }
@@ -229,110 +224,12 @@
     id: 16804187
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318811107
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-tables {
-  preamble {
-    id: 33574876
-    name: "FabricIngress.forwarding.acl"
-    alias: "acl"
-  }
-  match_fields {
-    id: 1
-    name: "standard_metadata.ingress_port"
-    bitwidth: 9
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 2
-    name: "fabric_metadata.ip_proto"
-    bitwidth: 8
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 3
-    name: "fabric_metadata.l4_src_port"
-    bitwidth: 16
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 4
-    name: "fabric_metadata.l4_dst_port"
-    bitwidth: 16
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 5
-    name: "hdr.ethernet.dst_addr"
-    bitwidth: 48
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 6
-    name: "hdr.ethernet.src_addr"
-    bitwidth: 48
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 7
-    name: "hdr.vlan_tag.vlan_id"
-    bitwidth: 12
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 8
-    name: "hdr.vlan_tag.ether_type"
-    bitwidth: 16
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 9
-    name: "hdr.ipv4.src_addr"
-    bitwidth: 32
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 10
-    name: "hdr.ipv4.dst_addr"
-    bitwidth: 32
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 11
-    name: "hdr.icmp.icmp_type"
-    bitwidth: 8
-    match_type: TERNARY
-  }
-  match_fields {
-    id: 12
-    name: "hdr.icmp.icmp_code"
-    bitwidth: 8
-    match_type: TERNARY
-  }
-  action_refs {
-    id: 16785374
-  }
-  action_refs {
-    id: 16801806
-  }
-  action_refs {
-    id: 16784835
-  }
-  action_refs {
-    id: 16833260
-  }
-  action_refs {
-    id: 16842570
-  }
-  const_default_action_id: 16842570
-  direct_resource_ids: 318772272
-  size: 128
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -342,7 +239,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv6.dst_addr"
+    name: "ipv6_dst"
     bitwidth: 128
     match_type: LPM
   }
@@ -350,22 +247,119 @@
     id: 16809751
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318799210
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33562709
-    name: "FabricIngress.next.vlan_meta"
-    alias: "vlan_meta"
+    id: 33618978
+    name: "FabricIngress.acl.acl"
+    alias: "acl"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "ig_port"
+    bitwidth: 9
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 2
+    name: "ip_proto"
+    bitwidth: 8
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 3
+    name: "l4_sport"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 4
+    name: "l4_dport"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 5
+    name: "eth_src"
+    bitwidth: 48
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 6
+    name: "eth_dst"
+    bitwidth: 48
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 7
+    name: "vlan_id"
+    bitwidth: 12
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 8
+    name: "eth_type"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 9
+    name: "ipv4_src"
+    bitwidth: 32
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 10
+    name: "ipv4_dst"
+    bitwidth: 32
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 11
+    name: "icmp_type"
+    bitwidth: 8
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 12
+    name: "icmp_code"
+    bitwidth: 8
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16807382
+  }
+  action_refs {
+    id: 16829684
+  }
+  action_refs {
+    id: 16790975
+  }
+  action_refs {
+    id: 16820765
+  }
+  action_refs {
+    id: 16827694
+  }
+  const_default_action_id: 16827694
+  direct_resource_ids: 318801025
+  size: 128
+}
+tables {
+  preamble {
+    id: 33599709
+    name: "FabricIngress.next.next_vlan"
+    alias: "next_vlan"
+  }
+  match_fields {
+    id: 1
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
@@ -376,9 +370,41 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318785328
+  const_default_action_id: 16819938
+  direct_resource_ids: 318768144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
+}
+tables {
+  preamble {
+    id: 33596977
+    name: "FabricIngress.next.xconnect"
+    alias: "xconnect"
+  }
+  match_fields {
+    id: 1
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "next_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16842190
+  }
+  action_refs {
+    id: 16837052
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly()"
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318778156
+  size: 1024
 }
 tables {
   preamble {
@@ -388,7 +414,7 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
@@ -396,27 +422,18 @@
     id: 16802668
   }
   action_refs {
-    id: 16808391
+    id: 16814145
   }
   action_refs {
-    id: 16780007
+    id: 16783036
   }
   action_refs {
-    id: 16806134
-  }
-  action_refs {
-    id: 16795970
-  }
-  action_refs {
-    id: 16791579
-  }
-  action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318769096
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -426,27 +443,27 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800211
+    id: 16815357
   }
   action_refs {
-    id: 16779239
+    id: 16791402
   }
   action_refs {
-    id: 16819349
+    id: 16779255
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  implementation_id: 285233747
+  const_default_action_id: 16819938
+  implementation_id: 285217164
   direct_resource_ids: 318800532
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -456,20 +473,20 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16789575
+    id: 16779917
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318801752
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -479,25 +496,25 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
@@ -505,12 +522,12 @@
     id: 16785857
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318800047
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -520,7 +537,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.int_header.is_valid"
+    name: "int_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
@@ -533,143 +550,6 @@
   }
   const_default_action_id: 16819938
   size: 1
-  idle_timeout_behavior: NO_TIMEOUT
-}
-tables {
-  preamble {
-    id: 33569467
-    name: "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
-    alias: "tb_int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16809886
-  }
-  action_refs {
-    id: 16783130
-  }
-  action_refs {
-    id: 16809096
-  }
-  action_refs {
-    id: 16834117
-  }
-  action_refs {
-    id: 16825314
-  }
-  action_refs {
-    id: 16811436
-  }
-  action_refs {
-    id: 16802199
-  }
-  action_refs {
-    id: 16796779
-  }
-  action_refs {
-    id: 16787676
-  }
-  action_refs {
-    id: 16825351
-  }
-  action_refs {
-    id: 16793999
-  }
-  action_refs {
-    id: 16786714
-  }
-  action_refs {
-    id: 16814203
-  }
-  action_refs {
-    id: 16807054
-  }
-  action_refs {
-    id: 16800064
-  }
-  action_refs {
-    id: 16792997
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 16
-  idle_timeout_behavior: NO_TIMEOUT
-  is_const_table: true
-}
-tables {
-  preamble {
-    id: 33595914
-    name: "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
-    alias: "tb_int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16819022
-  }
-  action_refs {
-    id: 16804144
-  }
-  action_refs {
-    id: 16829117
-  }
-  action_refs {
-    id: 16797781
-  }
-  action_refs {
-    id: 16813543
-  }
-  action_refs {
-    id: 16824974
-  }
-  action_refs {
-    id: 16815362
-  }
-  action_refs {
-    id: 16835399
-  }
-  action_refs {
-    id: 16834505
-  }
-  action_refs {
-    id: 16811493
-  }
-  action_refs {
-    id: 16825476
-  }
-  action_refs {
-    id: 16799777
-  }
-  action_refs {
-    id: 16829592
-  }
-  action_refs {
-    id: 16805877
-  }
-  action_refs {
-    id: 16780182
-  }
-  action_refs {
-    id: 16799476
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 16
-  idle_timeout_behavior: NO_TIMEOUT
-  is_const_table: true
 }
 tables {
   preamble {
@@ -681,11 +561,10 @@
     id: 16788620
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -695,13 +574,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "standard_metadata.egress_port"
+    name: "eg_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -712,16 +591,9 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318827144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
-  }
 }
 actions {
   preamble {
@@ -732,20 +604,6 @@
 }
 actions {
   preamble {
-    id: 16823970
-    name: "drop_now"
-    alias: "drop_now"
-  }
-}
-actions {
-  preamble {
-    id: 16819909
-    name: "FabricIngress.spgw_ingress.gtpu_decap"
-    alias: "gtpu_decap"
-  }
-}
-actions {
-  preamble {
     id: 16804065
     name: "FabricIngress.spgw_ingress.set_dl_sess_info"
     alias: "set_dl_sess_info"
@@ -782,44 +640,32 @@
 }
 actions {
   preamble {
-    id: 16798734
-    name: "FabricIngress.filtering.drop"
-    alias: "filtering.drop"
+    id: 16836487
+    name: "FabricIngress.filtering.deny"
+    alias: "deny"
   }
 }
 actions {
   preamble {
-    id: 16793253
-    name: "FabricIngress.filtering.set_vlan"
-    alias: "filtering.set_vlan"
+    id: 16818236
+    name: "FabricIngress.filtering.permit"
+    alias: "permit"
+  }
+}
+actions {
+  preamble {
+    id: 16794911
+    name: "FabricIngress.filtering.permit_with_internal_vlan"
+    alias: "permit_with_internal_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16835546
-    name: "FabricIngress.filtering.push_internal_vlan"
-    alias: "push_internal_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16833700
-    name: "FabricIngress.filtering.nop_ingress_port_vlan"
-    alias: "nop_ingress_port_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16840921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
@@ -875,46 +721,6 @@
 }
 actions {
   preamble {
-    id: 16785374
-    name: "FabricIngress.forwarding.set_next_id_acl"
-    alias: "set_next_id_acl"
-  }
-  params {
-    id: 1
-    name: "next_id"
-    bitwidth: 32
-  }
-}
-actions {
-  preamble {
-    id: 16801806
-    name: "FabricIngress.forwarding.punt_to_cpu"
-    alias: "punt_to_cpu"
-  }
-}
-actions {
-  preamble {
-    id: 16784835
-    name: "FabricIngress.forwarding.clone_to_cpu"
-    alias: "clone_to_cpu"
-  }
-}
-actions {
-  preamble {
-    id: 16833260
-    name: "FabricIngress.forwarding.drop"
-    alias: "forwarding.drop"
-  }
-}
-actions {
-  preamble {
-    id: 16842570
-    name: "FabricIngress.forwarding.nop_acl"
-    alias: "nop_acl"
-  }
-}
-actions {
-  preamble {
     id: 16809751
     name: "FabricIngress.forwarding.set_next_id_routing_v6"
     alias: "set_next_id_routing_v6"
@@ -927,18 +733,82 @@
 }
 actions {
   preamble {
-    id: 16790685
-    name: "FabricIngress.next.set_vlan"
-    alias: "next.set_vlan"
+    id: 16807382
+    name: "FabricIngress.acl.set_next_id_acl"
+    alias: "set_next_id_acl"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16829684
+    name: "FabricIngress.acl.punt_to_cpu"
+    alias: "punt_to_cpu"
+  }
+}
+actions {
+  preamble {
+    id: 16790975
+    name: "FabricIngress.acl.clone_to_cpu"
+    alias: "clone_to_cpu"
+  }
+}
+actions {
+  preamble {
+    id: 16820765
+    name: "FabricIngress.acl.drop"
+    alias: "drop"
+  }
+}
+actions {
+  preamble {
+    id: 16827694
+    name: "FabricIngress.acl.nop_acl"
+    alias: "nop_acl"
+  }
+}
+actions {
+  preamble {
+    id: 16790685
+    name: "FabricIngress.next.set_vlan"
+    alias: "set_vlan"
+  }
+  params {
+    id: 1
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
+    id: 16842190
+    name: "FabricIngress.next.output_xconnect"
+    alias: "output_xconnect"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+}
+actions {
+  preamble {
+    id: 16837052
+    name: "FabricIngress.next.set_next_id_xconnect"
+    alias: "set_next_id_xconnect"
+  }
+  params {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
     id: 16802668
     name: "FabricIngress.next.output_simple"
     alias: "output_simple"
@@ -951,26 +821,9 @@
 }
 actions {
   preamble {
-    id: 16808391
-    name: "FabricIngress.next.set_vlan_output"
-    alias: "set_vlan_output"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-  params {
-    id: 2
-    name: "port_num"
-    bitwidth: 9
-  }
-}
-actions {
-  preamble {
-    id: 16780007
-    name: "FabricIngress.next.l3_routing_simple"
-    alias: "l3_routing_simple"
+    id: 16814145
+    name: "FabricIngress.next.routing_simple"
+    alias: "routing_simple"
   }
   params {
     id: 1
@@ -990,9 +843,9 @@
 }
 actions {
   preamble {
-    id: 16806134
-    name: "FabricIngress.next.mpls_routing_v4_simple"
-    alias: "mpls_routing_v4_simple"
+    id: 16783036
+    name: "FabricIngress.next.mpls_routing_simple"
+    alias: "mpls_routing_simple"
   }
   params {
     id: 1
@@ -1017,9 +870,43 @@
 }
 actions {
   preamble {
-    id: 16795970
-    name: "FabricIngress.next.mpls_routing_v6_simple"
-    alias: "mpls_routing_v6_simple"
+    id: 16815357
+    name: "FabricIngress.next.output_hashed"
+    alias: "output_hashed"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+}
+actions {
+  preamble {
+    id: 16791402
+    name: "FabricIngress.next.routing_hashed"
+    alias: "routing_hashed"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+  params {
+    id: 2
+    name: "smac"
+    bitwidth: 48
+  }
+  params {
+    id: 3
+    name: "dmac"
+    bitwidth: 48
+  }
+}
+actions {
+  preamble {
+    id: 16779255
+    name: "FabricIngress.next.mpls_routing_hashed"
+    alias: "mpls_routing_hashed"
   }
   params {
     id: 1
@@ -1044,124 +931,21 @@
 }
 actions {
   preamble {
-    id: 16791579
-    name: "FabricIngress.next.l3_routing_vlan"
-    alias: "l3_routing_vlan"
+    id: 16779917
+    name: "FabricIngress.next.set_mcast_group_id"
+    alias: "set_mcast_group_id"
   }
   params {
     id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16800211
-    name: "FabricIngress.next.l3_routing_hashed"
-    alias: "l3_routing_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-}
-actions {
-  preamble {
-    id: 16779239
-    name: "FabricIngress.next.mpls_routing_v4_hashed"
-    alias: "mpls_routing_v4_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16819349
-    name: "FabricIngress.next.mpls_routing_v6_hashed"
-    alias: "mpls_routing_v6_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16789575
-    name: "FabricIngress.next.set_mcast_group"
-    alias: "set_mcast_group"
-  }
-  params {
-    id: 1
-    name: "gid"
+    name: "group_id"
     bitwidth: 16
   }
 }
 actions {
   preamble {
-    id: 16829135
-    name: "FabricEgress.spgw_egress.gtpu_encap"
-    alias: "gtpu_encap"
+    id: 16800567
+    name: "NoAction"
+    alias: "NoAction"
   }
 }
 actions {
@@ -1205,230 +989,6 @@
 }
 actions {
   preamble {
-    id: 16809886
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16783130
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16809096
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16834117
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16825314
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16811436
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16802199
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796779
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787676
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16825351
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16793999
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16786714
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16814203
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16807054
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13"
-    alias: "int_set_header_0003_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16800064
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16792997
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16819022
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16804144
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16829117
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16797781
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16813543
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16824974
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16815362
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16835399
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834505
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16811493
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16825476
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16799777
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16829592
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12"
-    alias: "int_set_header_0407_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16805877
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16780182
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16799476
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
     id: 16788620
     name: "FabricEgress.process_int_main.process_int_report.do_report_encapsulation"
     alias: "do_report_encapsulation"
@@ -1461,37 +1021,16 @@
 }
 actions {
   preamble {
-    id: 16816369
-    name: "FabricEgress.process_int_main.process_int_sink.restore_header"
-    alias: "restore_header"
-  }
-}
-actions {
-  preamble {
-    id: 16834566
-    name: "FabricEgress.process_int_main.process_int_sink.int_sink"
-    alias: "int_sink"
-  }
-}
-actions {
-  preamble {
-    id: 16801047
-    name: "FabricEgress.pkt_io_egress.pop_vlan"
-    alias: "pkt_io_egress.pop_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16790030
     name: "FabricEgress.egress_next.pop_vlan"
-    alias: "egress_next.pop_vlan"
+    alias: "pop_vlan"
   }
 }
 action_profiles {
   preamble {
-    id: 285233747
-    name: "FabricIngress.next.ecmp_selector"
-    alias: "ecmp_selector"
+    id: 285217164
+    name: "FabricIngress.next.hashed_selector"
+    alias: "hashed_selector"
   }
   table_ids: 33608588
   with_selector: true
@@ -1609,17 +1148,6 @@
 }
 direct_counters {
   preamble {
-    id: 318772272
-    name: "FabricIngress.forwarding.acl_counter"
-    alias: "acl_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33574876
-}
-direct_counters {
-  preamble {
     id: 318799210
     name: "FabricIngress.forwarding.routing_v6_counter"
     alias: "routing_v6_counter"
@@ -1631,14 +1159,36 @@
 }
 direct_counters {
   preamble {
-    id: 318785328
-    name: "FabricIngress.next.vlan_meta_counter"
-    alias: "vlan_meta_counter"
+    id: 318801025
+    name: "FabricIngress.acl.acl_counter"
+    alias: "acl_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33562709
+  direct_table_id: 33618978
+}
+direct_counters {
+  preamble {
+    id: 318768144
+    name: "FabricIngress.next.next_vlan_counter"
+    alias: "next_vlan_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33599709
+}
+direct_counters {
+  preamble {
+    id: 318778156
+    name: "FabricIngress.next.xconnect_counter"
+    alias: "xconnect_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33596977
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index 9f51572..a10301a 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -4,26 +4,29 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["last_ipv4_dscp", 6, false],
-        ["tmp", 4, false],
-        ["tmp_0", 32, false],
+        ["last_ipv4_dscp_0", 6, false],
+        ["tmp_0", 4, false],
+        ["tmp", 32, false],
         ["tmp_1", 32, false],
-        ["filtering_tmp_0", 1, false],
-        ["next_tmp_2", 1, false],
-        ["next_tmp_3", 1, false],
-        ["next_tmp_4", 1, false],
-        ["next_hasReturned_0", 1, false],
-        ["process_int_main_process_int_transit_hasReturned_0", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["process_int_main_process_int_transit_hasReturned", 1, false],
+        ["fabric_metadata_t.eth_type", 16, false],
+        ["fabric_metadata_t.ip_eth_type", 16, false],
+        ["fabric_metadata_t.vlan_id", 12, false],
+        ["fabric_metadata_t.vlan_pri", 3, false],
+        ["fabric_metadata_t.vlan_cfi", 1, false],
+        ["fabric_metadata_t.mpls_label", 20, false],
+        ["fabric_metadata_t.mpls_ttl", 8, false],
+        ["fabric_metadata_t.skip_forwarding", 1, false],
+        ["fabric_metadata_t.skip_next", 1, false],
         ["fabric_metadata_t.fwd_type", 3, false],
         ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.pop_vlan_when_packet_in", 1, false],
         ["fabric_metadata_t.is_multicast", 1, false],
         ["fabric_metadata_t.is_controller_packet_out", 1, false],
         ["fabric_metadata_t.clone_to_cpu", 1, false],
         ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_src_port", 16, false],
-        ["fabric_metadata_t.l4_dst_port", 16, false],
-        ["_padding_1", 1, false]
+        ["fabric_metadata_t.l4_sport", 16, false],
+        ["fabric_metadata_t.l4_dport", 16, false]
       ]
     },
     {
@@ -60,7 +63,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -70,7 +73,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -103,22 +106,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 6,
       "fields" : [
-        ["hw_type", 16, false],
-        ["proto_type", 16, false],
-        ["hw_addr_len", 8, false],
-        ["proto_addr_len", 8, false],
-        ["opcode", 16, false]
-      ]
-    },
-    {
-      "name" : "tcp_t",
-      "id" : 7,
-      "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["seq_no", 32, false],
         ["ack_no", 32, false],
         ["data_offset", 4, false],
@@ -132,17 +124,17 @@
     },
     {
       "name" : "udp_t",
-      "id" : 8,
+      "id" : 7,
       "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["len", 16, false],
         ["checksum", 16, false]
       ]
     },
     {
       "name" : "icmp_t",
-      "id" : 9,
+      "id" : 8,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -154,7 +146,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 10,
+      "id" : 9,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -162,7 +154,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -170,7 +162,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -180,7 +172,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 13,
+      "id" : 12,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -199,14 +191,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 14,
+      "id" : 13,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 15,
+      "id" : 14,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -214,14 +206,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 16,
+      "id" : 15,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 17,
+      "id" : 16,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -229,21 +221,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 18,
+      "id" : 17,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 19,
+      "id" : 18,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 20,
+      "id" : 19,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -251,14 +243,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 21,
+      "id" : 20,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 22,
+      "id" : 21,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -268,7 +260,7 @@
     },
     {
       "name" : "int_metadata_t",
-      "id" : 23,
+      "id" : 22,
       "fields" : [
         ["source", 1, 0],
         ["transit", 1, 0],
@@ -312,23 +304,23 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "inner_vlan_tag",
       "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 5,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 5,
-      "header_type" : "ipv4_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 6,
-      "header_type" : "arp_t",
+      "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -531,6 +523,32 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -548,12 +566,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -567,7 +579,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -588,12 +600,52 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -613,13 +665,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["inner_vlan_tag", "eth_type"]
             }
           ]
         },
         {
           "name" : "parse_mpls",
-          "id" : 4,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -634,7 +686,33 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -660,13 +738,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -694,7 +772,20 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -737,29 +828,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 6,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 7,
           "parser_ops" : [
@@ -776,11 +844,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "src_port"]
+                  "value" : ["tcp", "sport"]
                 }
               ],
               "op" : "set"
@@ -789,11 +857,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "dst_port"]
+                  "value" : ["tcp", "dport"]
                 }
               ],
               "op" : "set"
@@ -825,11 +893,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "src_port"]
+                  "value" : ["udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -838,11 +906,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "dst_port"]
+                  "value" : ["udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -858,7 +926,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -905,7 +973,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "last_ipv4_dscp"]
+              "value" : ["scalars", "last_ipv4_dscp_0"]
             }
           ]
         },
@@ -998,11 +1066,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
     }
   ],
   "meter_arrays" : [],
@@ -1026,7 +1094,7 @@
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 34,
+        "line" : 31,
         "column" : 50,
         "source_fragment" : "ingress_port_vlan_counter"
       }
@@ -1038,7 +1106,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -1050,7 +1118,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -1062,7 +1130,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1074,45 +1142,45 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 80,
+        "line" : 82,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
     },
     {
-      "name" : "FabricIngress.forwarding.acl_counter",
+      "name" : "FabricIngress.acl.acl_counter",
       "id" : 6,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
+      "binding" : "FabricIngress.acl.acl",
       "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
         "column" : 50,
         "source_fragment" : "acl_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.vlan_meta",
+      "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 58,
+        "line" : 67,
         "column" : 50,
-        "source_fragment" : "vlan_meta_counter"
+        "source_fragment" : "next_vlan_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.simple_counter",
+      "name" : "FabricIngress.next.xconnect_counter",
       "id" : 8,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.simple",
+      "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 91,
         "column" : 50,
-        "source_fragment" : "simple_counter"
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
@@ -1122,7 +1190,7 @@
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
@@ -1134,7 +1202,7 @@
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
@@ -1144,7 +1212,7 @@
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -1156,7 +1224,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -1182,7 +1250,7 @@
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -1316,43 +1384,43 @@
   "learn_lists" : [],
   "actions" : [
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 0,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 1,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 2,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 3,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 4,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 5,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 6,
       "runtime_data" : [],
       "primitives" : []
@@ -1400,179 +1468,16 @@
       ]
     },
     {
-      "name" : "FabricIngress.filtering.drop",
+      "name" : "FabricIngress.filtering.deny",
       "id" : 9,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 10,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 11,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "cfi"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "pri"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 52,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 99,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
+              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -1591,22 +1496,82 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
+            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 12,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 10,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 11,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 13,
+      "id" : 12,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -1628,7 +1593,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -1637,7 +1602,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 14,
+      "id" : 13,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1659,16 +1624,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 37,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 15,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1677,18 +1642,22 @@
       ],
       "primitives" : [
         {
-          "op" : "remove_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "mpls"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
             }
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 60,
+            "line" : 62,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
           }
         },
         {
@@ -1705,16 +1674,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 61,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 16,
+      "id" : 15,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1736,22 +1705,22 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 17,
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
-      "id" : 18,
+      "name" : "FabricIngress.acl.set_next_id_acl",
+      "id" : 17,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1772,8 +1741,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 110,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -1781,8 +1750,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
-      "id" : 19,
+      "name" : "FabricIngress.acl.punt_to_cpu",
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1798,27 +1767,46 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 116,
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
         },
         {
-          "op" : "exit",
-          "parameters" : [],
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 118,
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
             "column" : 8,
-            "source_fragment" : "exit"
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.clone_to_cpu",
-      "id" : 20,
+      "name" : "FabricIngress.acl.clone_to_cpu",
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1844,8 +1832,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 123,
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "fabric_metadata.clone_to_cpu = true"
           }
@@ -1853,64 +1841,93 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
-      "id" : 21,
+      "name" : "FabricIngress.acl.drop",
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 128,
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
+          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_acl",
-      "id" : 22,
+      "name" : "FabricIngress.acl.nop_acl",
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
+      "id" : 22,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 70,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_xconnect",
       "id" : 23,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 61,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_simple",
-      "id" : 24,
-      "runtime_data" : [
-        {
           "name" : "port_num",
           "bitwidth" : 9
         }
@@ -1930,69 +1947,77 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_vlan_output",
-      "id" : 25,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_simple",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 24,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
+      "id" : 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.routing_hashed",
       "id" : 26,
       "runtime_data" : [
         {
@@ -2023,7 +2048,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2061,15 +2086,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_simple",
+      "name" : "FabricIngress.next.mpls_routing_hashed",
       "id" : 27,
       "runtime_data" : [
         {
@@ -2095,6 +2120,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -2104,7 +2148,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2142,879 +2186,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v6_simple",
+      "name" : "FabricIngress.next.set_mcast_group_id",
       "id" : 28,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_vlan",
-      "id" : 29,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_hashed",
-      "id" : 30,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
-      "id" : 31,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 32,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -3033,9 +2217,9 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "standard_metadata.mcast_grp = gid"
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
         },
         {
@@ -3062,7 +2246,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -3071,7 +2255,7 @@
     },
     {
       "name" : "act",
-      "id" : 34,
+      "id" : 29,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3088,7 +2272,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 26,
+            "line" : 25,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
           }
@@ -3103,7 +2287,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -3132,7 +2316,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -3141,7 +2325,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 35,
+      "id" : 30,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3149,29 +2333,82 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 103,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+          }
         }
       ]
     },
     {
       "name" : "act_1",
-      "id" : 36,
+      "id" : 31,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3179,29 +2416,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x41"
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 113,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+          }
         }
       ]
     },
     {
       "name" : "act_2",
-      "id" : 37,
+      "id" : 32,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3209,354 +2442,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x07"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 119,
-            "column" : 31,
-            "source_fragment" : "7; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_3",
-      "id" : 38,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 102,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 39,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_5",
-      "id" : 40,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_6",
-      "id" : 41,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_7",
-      "id" : 42,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_8",
-      "id" : 43,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
-      "id" : 44,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 45,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 46,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 223,
-            "column" : 20,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_12",
-      "id" : 47,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv4", "ttl"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv4", "ttl"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 230,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_13",
-      "id" : 48,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             },
             {
               "type" : "expression",
@@ -3578,7 +2464,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
           }
@@ -3592,12 +2478,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
           }
@@ -3605,8 +2491,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 49,
+      "name" : "act_3",
+      "id" : 33,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3636,7 +2522,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
           }
@@ -3655,7 +2541,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
           }
@@ -3663,92 +2549,38 @@
       ]
     },
     {
-      "name" : "NoAction",
-      "id" : 50,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 51,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 52,
+      "name" : "nop",
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 53,
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 54,
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 55,
+      "name" : "NoAction",
+      "id" : 37,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 56,
+      "name" : "NoAction",
+      "id" : 38,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 57,
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -3778,7 +2610,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setValid()"
           }
@@ -3797,7 +2629,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 33,
+            "line" : 34,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.int_type = 1"
           }
@@ -3816,7 +2648,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 139,
+            "line" : 147,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -3831,7 +2663,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setValid()"
           }
@@ -3850,7 +2682,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ver = 0"
           }
@@ -3869,7 +2701,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 38,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rep = 0"
           }
@@ -3888,7 +2720,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 39,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.int_header.c = 0"
           }
@@ -3907,7 +2739,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_header.e = 0"
           }
@@ -3926,7 +2758,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rsvd1 = 0"
           }
@@ -3945,7 +2777,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 42,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ins_cnt = ins_cnt; ..."
           }
@@ -3964,7 +2796,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 43,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.int_header.max_hop_cnt = max_hop; ..."
           }
@@ -3983,7 +2815,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 44,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = 0"
           }
@@ -4002,7 +2834,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 45,
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0003 = ins_mask0003; ..."
           }
@@ -4021,7 +2853,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 46,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0407 = ins_mask0407; ..."
           }
@@ -4040,7 +2872,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 47,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0811 = 0"
           }
@@ -4059,7 +2891,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 48,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_1215 = 0"
           }
@@ -4074,7 +2906,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setValid()"
           }
@@ -4093,7 +2925,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 51,
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.next_proto = hdr.ipv4.protocol"
           }
@@ -4107,14 +2939,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 52,
+            "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dst_port"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
           }
         },
         {
@@ -4131,7 +2963,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 53,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.dscp = hdr.ipv4.dscp"
           }
@@ -4173,7 +3005,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + INT_HEADER_LEN_BYTES"
           }
@@ -4215,7 +3047,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + INT_HEADER_LEN_BYTES"
           }
@@ -4234,7 +3066,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 143,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -4243,7 +3075,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 58,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -4303,13 +3135,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 59,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 60,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4322,7 +3154,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -4341,7 +3173,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -4373,7 +3205,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -4415,7 +3247,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -4457,7 +3289,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -4466,7 +3298,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 61,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4479,7 +3311,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -4498,7 +3330,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -4540,7 +3372,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -4582,7 +3414,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -4591,7 +3423,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 62,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4604,7 +3436,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -4623,7 +3455,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -4655,7 +3487,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -4670,7 +3502,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -4689,7 +3521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -4731,7 +3563,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -4773,7 +3605,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -4782,7 +3614,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 63,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4795,7 +3627,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -4827,7 +3659,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -4859,7 +3691,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -4901,7 +3733,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -4943,7 +3775,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -4952,7 +3784,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 64,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4965,7 +3797,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -4984,7 +3816,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5016,7 +3848,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -5031,7 +3863,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -5063,7 +3895,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -5095,7 +3927,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -5137,7 +3969,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -5179,7 +4011,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -5188,7 +4020,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 65,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5201,7 +4033,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -5220,7 +4052,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -5235,7 +4067,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -5267,7 +4099,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -5299,7 +4131,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -5341,7 +4173,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -5383,7 +4215,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -5392,7 +4224,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 66,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5405,7 +4237,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -5424,7 +4256,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5456,7 +4288,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -5471,7 +4303,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -5490,7 +4322,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -5505,7 +4337,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -5537,7 +4369,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -5569,7 +4401,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -5611,7 +4443,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -5653,7 +4485,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -5662,7 +4494,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 67,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5675,7 +4507,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -5694,7 +4526,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -5736,7 +4568,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -5778,7 +4610,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -5787,7 +4619,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 68,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5800,7 +4632,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -5819,7 +4651,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5851,7 +4683,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -5866,7 +4698,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -5885,7 +4717,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -5927,7 +4759,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -5969,7 +4801,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -5978,7 +4810,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 69,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5991,7 +4823,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6010,7 +4842,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6025,7 +4857,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6044,7 +4876,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6086,7 +4918,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6128,7 +4960,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6137,7 +4969,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 70,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6150,7 +4982,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6169,7 +5001,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6201,7 +5033,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6216,7 +5048,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6235,7 +5067,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6250,7 +5082,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6269,7 +5101,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6311,7 +5143,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -6353,7 +5185,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -6362,7 +5194,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 71,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6375,7 +5207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6407,7 +5239,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6439,7 +5271,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6454,7 +5286,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6473,7 +5305,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6515,7 +5347,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6557,7 +5389,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6566,7 +5398,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 72,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6579,7 +5411,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6598,7 +5430,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6630,7 +5462,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6645,7 +5477,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6677,7 +5509,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6709,7 +5541,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6724,7 +5556,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6743,7 +5575,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6785,7 +5617,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -6827,7 +5659,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -6836,7 +5668,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 73,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6849,7 +5681,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6868,7 +5700,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6883,7 +5715,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6915,7 +5747,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6947,7 +5779,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6962,7 +5794,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6981,7 +5813,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7023,7 +5855,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -7065,7 +5897,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -7074,7 +5906,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 74,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7087,7 +5919,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7106,7 +5938,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7138,7 +5970,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7153,7 +5985,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7172,7 +6004,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7187,7 +6019,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7219,7 +6051,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7251,7 +6083,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7266,7 +6098,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7285,7 +6117,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7327,7 +6159,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -7369,7 +6201,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -7378,13 +6210,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 75,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 76,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7397,7 +6229,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -7416,7 +6248,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -7458,7 +6290,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7500,7 +6332,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7509,7 +6341,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 77,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7522,7 +6354,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -7541,7 +6373,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -7560,7 +6392,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -7602,7 +6434,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7644,7 +6476,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7653,7 +6485,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 78,
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7666,7 +6498,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -7685,7 +6517,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -7700,7 +6532,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -7719,7 +6551,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -7738,7 +6570,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -7780,7 +6612,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7822,7 +6654,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7831,7 +6663,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 79,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7844,7 +6676,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -7886,7 +6718,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -7928,7 +6760,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7970,7 +6802,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7979,7 +6811,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 80,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7992,7 +6824,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -8011,7 +6843,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -8026,7 +6858,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -8068,7 +6900,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -8110,7 +6942,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8152,7 +6984,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8161,7 +6993,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 81,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8174,7 +7006,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -8193,7 +7025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -8212,7 +7044,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -8227,7 +7059,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -8269,7 +7101,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -8311,7 +7143,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8353,7 +7185,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8362,7 +7194,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 82,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8375,7 +7207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -8394,7 +7226,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -8409,7 +7241,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -8428,7 +7260,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -8447,7 +7279,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -8462,7 +7294,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -8504,7 +7336,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -8546,7 +7378,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8588,7 +7420,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8597,7 +7429,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 83,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8610,7 +7442,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -8629,7 +7461,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -8671,7 +7503,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -8713,7 +7545,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -8722,7 +7554,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 84,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8735,7 +7567,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -8754,7 +7586,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -8769,7 +7601,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -8788,7 +7620,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -8830,7 +7662,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8872,7 +7704,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8881,7 +7713,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 85,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8894,7 +7726,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -8913,7 +7745,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -8932,7 +7764,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -8947,7 +7779,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -8966,7 +7798,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9008,7 +7840,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9050,7 +7882,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9059,7 +7891,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 86,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9072,7 +7904,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9091,7 +7923,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9106,7 +7938,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9125,7 +7957,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9144,7 +7976,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9159,7 +7991,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9178,7 +8010,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9220,7 +8052,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9262,7 +8094,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9271,7 +8103,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 87,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9284,7 +8116,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9326,7 +8158,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9341,7 +8173,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9360,7 +8192,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9402,7 +8234,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9444,7 +8276,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9453,7 +8285,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 88,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9466,7 +8298,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9485,7 +8317,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9500,7 +8332,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9542,7 +8374,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9557,7 +8389,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9576,7 +8408,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9618,7 +8450,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9660,7 +8492,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9669,7 +8501,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 89,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9682,7 +8514,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9701,7 +8533,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9720,7 +8552,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9735,7 +8567,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9777,7 +8609,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9792,7 +8624,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9811,7 +8643,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9853,7 +8685,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9895,7 +8727,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9904,7 +8736,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 90,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9917,7 +8749,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9936,7 +8768,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9951,7 +8783,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9970,7 +8802,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9989,7 +8821,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10004,7 +8836,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10046,7 +8878,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10061,7 +8893,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10080,7 +8912,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10122,7 +8954,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -10164,7 +8996,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -10172,68 +9004,302 @@
       ]
     },
     {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 91,
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 40,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
           "op" : "remove_header",
           "parameters" : [
             {
               "type" : "header",
-              "value" : "vlan_tag"
+              "value" : "mpls"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 41,
+            "filename" : "include/control/next.p4",
+            "line" : 246,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+            "source_fragment" : "hdr.mpls.setInvalid()"
           }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 92,
-      "runtime_data" : [],
-      "primitives" : [
+        },
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 248,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 74,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 253,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 255,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 256,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 257,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 75,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 266,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 267,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 269,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 76,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 280,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
           }
         },
         {
@@ -10246,7 +9312,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -10254,8 +9320,25 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 93,
+      "name" : "act_4",
+      "id" : 77,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_5",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10268,7 +9351,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 57,
+            "line" : 49,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -10287,7 +9370,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 58,
+            "line" : 50,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -10295,8 +9378,25 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 94,
+      "name" : "act_6",
+      "id" : 79,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10304,7 +9404,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_8",
+      "id" : 81,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -10325,8 +9455,25 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 95,
+      "name" : "act_9",
+      "id" : 82,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10334,7 +9481,152 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_11",
+      "id" : 84,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_12",
+      "id" : 85,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 323,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_13",
+      "id" : 86,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_14",
+      "id" : 87,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -10353,7 +9645,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 376,
+            "line" : 420,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -10361,8 +9653,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 96,
+      "name" : "act_15",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10402,7 +9694,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 384,
+            "line" : 428,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
           }
@@ -10410,8 +9702,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 97,
+      "name" : "act_16",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10451,7 +9743,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 381,
+            "line" : 425,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
           }
@@ -10459,8 +9751,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 98,
+      "name" : "act_17",
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10500,7 +9792,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 387,
+            "line" : 431,
             "column" : 12,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
           }
@@ -10508,8 +9800,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 99,
+      "name" : "act_18",
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10549,7 +9841,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 390,
+            "line" : 434,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
           }
@@ -10563,7 +9855,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -10579,14 +9871,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34],
+          "action_ids" : [29],
           "actions" : ["act"],
           "base_default_next" : null,
           "next_tables" : {
             "act" : null
           },
           "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 29,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_0",
+          "id" : 1,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [30],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_6",
+          "next_tables" : {
+            "act_0" : "node_6"
+          },
+          "default_entry" : {
+            "action_id" : 30,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_1",
+          "id" : 2,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [31],
+          "actions" : ["act_1"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_1" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 31,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10594,29 +9932,29 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 1,
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 66,
+            "line" : 51,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.is_valid",
+              "name" : "vlan_is_valid",
               "target" : ["vlan_tag", "$valid$"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             }
@@ -10627,61 +9965,16 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11, 10, 9, 12],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
+          "action_ids" : [9, 10, 11],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
-            "__HIT__" : "tbl_act_0",
-            "__MISS__" : "tbl_act_1"
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 11,
-            "action_const" : true,
-            "action_data" : ["0xffe"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_0",
-          "id" : 2,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [35],
-          "actions" : ["act_0"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_0" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 35,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [36],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_1" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10692,27 +9985,27 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 103,
+            "line" : 86,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             }
           ],
@@ -10722,61 +10015,38 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13],
+          "action_ids" : [12],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 13,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_2",
-          "id" : 5,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [37],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_10",
-          "next_tables" : {
-            "act_2" : "node_10"
-          },
-          "default_entry" : {
-            "action_id" : 37,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 6,
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 10,
             "source_fragment" : "bridging"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -10787,34 +10057,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 1],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [13, 1],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 1,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 7,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "mpls"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.mpls.label",
-              "target" : ["mpls", "label"],
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
               "mask" : null
             }
           ],
@@ -10824,38 +10094,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 2],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_3",
+          "action_ids" : [14, 2],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_3",
-            "NoAction" : "tbl_act_3"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_3",
-          "id" : 8,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [38],
-          "actions" : ["act_3"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_3" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 38,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10863,17 +10110,17 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 9,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 91,
+            "line" : 93,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -10884,100 +10131,100 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 17, 3],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [15, 16, 3],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
-            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 3,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 10,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 8,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 136,
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
             "column" : 10,
             "source_fragment" : "acl"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.ip_proto",
+              "name" : "ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_src",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.src_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_type",
+              "name" : "icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_code",
+              "name" : "icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -10988,26 +10235,178 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 19, 20, 21, 22],
-          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_4",
+          "action_ids" : [17, 18, 19, 20, 21],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_18",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_4",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_4",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_4",
-            "FabricIngress.forwarding.drop" : "tbl_act_4",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_4"
+            "FabricIngress.acl.set_next_id_acl" : "node_18",
+            "FabricIngress.acl.punt_to_cpu" : "node_18",
+            "FabricIngress.acl.clone_to_cpu" : "node_18",
+            "FabricIngress.acl.drop" : "node_18",
+            "FabricIngress.acl.nop_acl" : "node_18"
           },
           "default_entry" : {
-            "action_id" : 22,
+            "action_id" : 21,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_4",
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [23, 24, 5],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.hashed",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 5,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 10,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 180,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [25, 26, 27, 6],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
           "id" : 11,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [28, 7],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 7,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 12,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [22, 4],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_23",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_23",
+            "nop" : "node_23"
+          },
+          "default_entry" : {
+            "action_id" : 4,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11015,95 +10414,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_4"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [32],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_25",
           "next_tables" : {
-            "act_4" : "FabricIngress.next.vlan_meta"
+            "act_2" : "node_25"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 65,
-            "column" : 10,
-            "source_fragment" : "vlan_meta"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [23, 7],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "FabricIngress.next.simple",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "FabricIngress.next.simple",
-            "nop" : "FabricIngress.next.simple"
-          },
-          "default_entry" : {
-            "action_id" : 7,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.next.simple",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 122,
-            "column" : 10,
-            "source_fragment" : "simple"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [24, 25, 26, 27, 28, 29, 4],
-          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_5",
-            "__MISS__" : "tbl_act_6"
-          },
-          "default_entry" : {
-            "action_id" : 4,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_3",
           "id" : 14,
           "key" : [],
           "match_type" : "exact",
@@ -11112,290 +10437,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_23",
-          "next_tables" : {
-            "act_5" : "node_23"
-          },
-          "default_entry" : {
-            "action_id" : 40,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_6",
-          "id" : 15,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_23",
-          "next_tables" : {
-            "act_6" : "node_23"
-          },
-          "default_entry" : {
-            "action_id" : 41,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 175,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "FabricIngress.next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [30, 31, 32, 5],
-          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_7",
-            "__MISS__" : "tbl_act_8"
-          }
-        },
-        {
-          "name" : "tbl_act_7",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_7"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_7" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 18,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_8" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 43,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 207,
-            "column" : 10,
-            "source_fragment" : "multicast"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [33, 6],
-          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
-          },
-          "default_entry" : {
-            "action_id" : 6,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 20,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_31",
-          "next_tables" : {
-            "act_9" : "node_31"
-          },
-          "default_entry" : {
-            "action_id" : 44,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 21,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_31",
-          "next_tables" : {
-            "act_10" : "node_31"
-          },
-          "default_entry" : {
-            "action_id" : 45,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 22,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_33",
-          "next_tables" : {
-            "act_11" : "node_33"
-          },
-          "default_entry" : {
-            "action_id" : 46,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_12",
-          "id" : 23,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_37",
-          "next_tables" : {
-            "act_12" : "node_37"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
-          "id" : 24,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_39",
-          "next_tables" : {
-            "act_13" : "node_39"
-          },
-          "default_entry" : {
-            "action_id" : 48,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_14",
-          "id" : 25,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_14"],
+          "action_ids" : [33],
+          "actions" : ["act_3"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_14" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_3" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 33,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11403,7 +10452,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 26,
+          "id" : 15,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -11413,7 +10462,7 @@
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             }
@@ -11425,29 +10474,29 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [8, 0],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricIngress.process_set_source_sink.int_set_source" : null,
-            "NoAction" : null
+            "nop" : null
           },
           "default_entry" : {
             "action_id" : 0,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         }
       ],
       "action_profiles" : [
         {
-          "name" : "FabricIngress.next.ecmp_selector",
+          "name" : "FabricIngress.next.hashed_selector",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 145,
+            "line" : 161,
             "column" : 55,
-            "source_fragment" : "ecmp_selector"
+            "source_fragment" : "hashed_selector"
           },
           "max_size" : 64,
           "selector" : {
@@ -11467,11 +10516,11 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
               }
             ]
           }
@@ -11483,7 +10532,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -11499,11 +10548,17 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+          "false_next" : "node_4"
         },
         {
-          "name" : "node_7",
+          "name" : "node_4",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 102,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -11511,20 +10566,83 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "filtering_tmp_0"]
+                "value" : ["vlan_tag", "$valid$"]
               }
             }
           },
-          "true_next" : "FabricIngress.filtering.fwd_classifier",
-          "false_next" : "tbl_act_2"
+          "true_next" : "tbl_act_0",
+          "false_next" : "node_6"
+        },
+        {
+          "name" : "node_6",
+          "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_1",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
           "name" : "node_10",
-          "id" : 2,
+          "id" : 3,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_11",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_11",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 191,
-            "column" : 11,
+            "line" : 131,
+            "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
           "expression" : {
@@ -11542,14 +10660,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_12"
+          "false_next" : "node_13"
         },
         {
-          "name" : "node_12",
-          "id" : 3,
+          "name" : "node_13",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 192,
+            "line" : 132,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -11572,10 +10690,10 @@
         },
         {
           "name" : "node_15",
-          "id" : 4,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 198,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -11594,181 +10712,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_18",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 70,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
           "name" : "node_23",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 219,
-            "column" : 12,
-            "source_fragment" : "!simple.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_4"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_27",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 220,
-            "column" : 16,
-            "source_fragment" : "!hashed.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_3"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_31",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 221,
-            "column" : 20,
-            "source_fragment" : "!multicast.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_2"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_11",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_33",
           "id" : 8,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_hasReturned_0"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_34",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_34",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
-            "column" : 12,
-            "source_fragment" : "!hdr.mpls.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["mpls", "$valid$"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_35",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_35",
-          "id" : 10,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 229,
-            "column" : 15,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_12",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_37",
-          "id" : 11,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -11786,15 +10770,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_39"
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_25"
         },
         {
-          "name" : "node_39",
-          "id" : 12,
+          "name" : "node_25",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -11812,7 +10796,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_3",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -11822,15 +10806,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_44",
+      "init_table" : "node_30",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 27,
+          "name" : "tbl_act_4",
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11838,22 +10822,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_48",
+          "action_ids" : [77],
+          "actions" : ["act_4"],
+          "base_default_next" : "tbl_act_5",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_48"
+            "act_4" : "tbl_act_5"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 77,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 28,
+          "name" : "tbl_act_5",
+          "id" : 17,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11861,45 +10845,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_15",
-          "next_tables" : {
-            "drop_now" : "tbl_act_15"
-          },
-          "default_entry" : {
-            "action_id" : 55,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_15",
-          "id" : 29,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["act_15"],
+          "action_ids" : [78],
+          "actions" : ["act_5"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "act_5" : null
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 30,
+          "name" : "tbl_act_6",
+          "id" : 18,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11907,14 +10868,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [79],
+          "actions" : ["act_6"],
+          "base_default_next" : "node_37",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_6" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 79,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 19,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [73],
+          "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" : 73,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 20,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [74],
+          "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" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11922,23 +10929,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 31,
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 258,
+            "line" : 285,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_port",
+              "name" : "eg_port",
               "target" : ["standard_metadata", "egress_port"],
               "mask" : null
             }
@@ -11949,52 +10956,213 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92, 54],
+          "action_ids" : [76, 36],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_54",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_54",
-            "nop" : "node_54"
+            "__HIT__" : "tbl_act_7",
+            "__MISS__" : "tbl_act_8"
           },
           "default_entry" : {
-            "action_id" : 54,
-            "action_const" : false,
+            "action_id" : 36,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 22,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [80],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_44",
+          "next_tables" : {
+            "act_7" : "node_44"
+          },
+          "default_entry" : {
+            "action_id" : 80,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_8",
+          "id" : 23,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [81],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_44",
+          "next_tables" : {
+            "act_8" : "node_44"
+          },
+          "default_entry" : {
+            "action_id" : 81,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 24,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [75],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_47",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_47"
+          },
+          "default_entry" : {
+            "action_id" : 75,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_9",
+          "id" : 25,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [83],
+          "actions" : ["act_10"],
+          "base_default_next" : "node_49",
+          "next_tables" : {
+            "act_10" : "node_49"
+          },
+          "default_entry" : {
+            "action_id" : 83,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_10",
+          "id" : 26,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [82],
+          "actions" : ["act_9"],
+          "base_default_next" : "node_55",
+          "next_tables" : {
+            "act_9" : "node_55"
+          },
+          "default_entry" : {
+            "action_id" : 82,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_11",
+          "id" : 27,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [85],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_53",
+          "next_tables" : {
+            "act_12" : "node_53"
+          },
+          "default_entry" : {
+            "action_id" : 85,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_12",
+          "id" : 28,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [84],
+          "actions" : ["act_11"],
+          "base_default_next" : "node_55",
+          "next_tables" : {
+            "act_11" : "node_55"
+          },
+          "default_entry" : {
+            "action_id" : 84,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 32,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 65,
+            "line" : 66,
             "column" : 10,
             "source_fragment" : "tb_int_source"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             }
           ],
@@ -12004,23 +11172,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57, 50],
-          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_57",
+          "action_ids" : [39, 34],
+          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
+          "base_default_next" : "node_58",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_57",
-            "NoAction" : "node_57"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_58",
+            "nop" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 50,
-            "action_const" : false,
+            "action_id" : 34,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 33,
+          "name" : "tbl_act_13",
+          "id" : 30,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12028,14 +11196,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["act_16"],
+          "action_ids" : [86],
+          "actions" : ["act_13"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_16" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_13" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12043,17 +11211,17 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 34,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 271,
+            "line" : 315,
             "column" : 10,
             "source_fragment" : "tb_int_insert"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.int_header.is_valid",
+              "name" : "int_is_valid",
               "target" : ["int_header", "$valid$"],
               "mask" : null
             }
@@ -12064,23 +11232,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58, 53],
+          "action_ids" : [40, 35],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_60",
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_60",
-            "nop" : "node_60"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_61",
+            "nop" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 35,
+          "name" : "tbl_act_14",
+          "id" : 32,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12088,14 +11256,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_62",
+          "action_ids" : [87],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_63",
           "next_tables" : {
-            "act_17" : "node_62"
+            "act_14" : "node_63"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12103,10 +11271,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 36,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 286,
+            "line" : 331,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0003"
           },
@@ -12124,7 +11292,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 51],
+          "action_ids" : [41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 37],
           "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" : {
@@ -12147,7 +11315,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 37,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -12156,7 +11324,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 310,
+                "line" : 354,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0003_i0()"
               },
@@ -12167,7 +11335,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 41,
                 "action_data" : []
               },
               "priority" : 1
@@ -12175,7 +11343,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 311,
+                "line" : 355,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0003_i1()"
               },
@@ -12186,7 +11354,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 60,
+                "action_id" : 42,
                 "action_data" : []
               },
               "priority" : 2
@@ -12194,7 +11362,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 312,
+                "line" : 356,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0003_i2()"
               },
@@ -12205,7 +11373,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 61,
+                "action_id" : 43,
                 "action_data" : []
               },
               "priority" : 3
@@ -12213,7 +11381,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 313,
+                "line" : 357,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0003_i3()"
               },
@@ -12224,7 +11392,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 62,
+                "action_id" : 44,
                 "action_data" : []
               },
               "priority" : 4
@@ -12232,7 +11400,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 314,
+                "line" : 358,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0003_i4()"
               },
@@ -12243,7 +11411,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 63,
+                "action_id" : 45,
                 "action_data" : []
               },
               "priority" : 5
@@ -12251,7 +11419,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 315,
+                "line" : 359,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0003_i5()"
               },
@@ -12262,7 +11430,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 64,
+                "action_id" : 46,
                 "action_data" : []
               },
               "priority" : 6
@@ -12270,7 +11438,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 316,
+                "line" : 360,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0003_i6()"
               },
@@ -12281,7 +11449,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 65,
+                "action_id" : 47,
                 "action_data" : []
               },
               "priority" : 7
@@ -12289,7 +11457,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 317,
+                "line" : 361,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0003_i7()"
               },
@@ -12300,7 +11468,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 66,
+                "action_id" : 48,
                 "action_data" : []
               },
               "priority" : 8
@@ -12308,7 +11476,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 318,
+                "line" : 362,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0003_i8()"
               },
@@ -12319,7 +11487,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 67,
+                "action_id" : 49,
                 "action_data" : []
               },
               "priority" : 9
@@ -12327,7 +11495,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 319,
+                "line" : 363,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0003_i9()"
               },
@@ -12338,7 +11506,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 50,
                 "action_data" : []
               },
               "priority" : 10
@@ -12346,7 +11514,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 320,
+                "line" : 364,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0003_i10()"
               },
@@ -12357,7 +11525,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 51,
                 "action_data" : []
               },
               "priority" : 11
@@ -12365,7 +11533,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 321,
+                "line" : 365,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0003_i11()"
               },
@@ -12376,7 +11544,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 52,
                 "action_data" : []
               },
               "priority" : 12
@@ -12384,7 +11552,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 322,
+                "line" : 366,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0003_i12()"
               },
@@ -12395,7 +11563,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 53,
                 "action_data" : []
               },
               "priority" : 13
@@ -12403,7 +11571,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 323,
+                "line" : 367,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0003_i13()"
               },
@@ -12414,7 +11582,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 54,
                 "action_data" : []
               },
               "priority" : 14
@@ -12422,7 +11590,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 324,
+                "line" : 368,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0003_i14()"
               },
@@ -12433,7 +11601,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 55,
                 "action_data" : []
               },
               "priority" : 15
@@ -12441,7 +11609,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 325,
+                "line" : 369,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0003_i15()"
               },
@@ -12452,7 +11620,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 56,
                 "action_data" : []
               },
               "priority" : 16
@@ -12461,10 +11629,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 37,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 330,
+            "line" : 375,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0407"
           },
@@ -12482,30 +11650,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 52],
+          "action_ids" : [57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 38],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_18",
+          "base_default_next" : "tbl_act_15",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_18",
-            "NoAction" : "tbl_act_18"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_15",
+            "NoAction" : "tbl_act_15"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 38,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -12514,7 +11682,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 354,
+                "line" : 398,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0407_i0()"
               },
@@ -12525,7 +11693,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 57,
                 "action_data" : []
               },
               "priority" : 1
@@ -12533,7 +11701,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 355,
+                "line" : 399,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0407_i1()"
               },
@@ -12544,7 +11712,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 58,
                 "action_data" : []
               },
               "priority" : 2
@@ -12552,7 +11720,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 356,
+                "line" : 400,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0407_i2()"
               },
@@ -12563,7 +11731,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 59,
                 "action_data" : []
               },
               "priority" : 3
@@ -12571,7 +11739,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 357,
+                "line" : 401,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0407_i3()"
               },
@@ -12582,7 +11750,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 60,
                 "action_data" : []
               },
               "priority" : 4
@@ -12590,7 +11758,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 358,
+                "line" : 402,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0407_i4()"
               },
@@ -12601,7 +11769,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 61,
                 "action_data" : []
               },
               "priority" : 5
@@ -12609,7 +11777,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 359,
+                "line" : 403,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0407_i5()"
               },
@@ -12620,7 +11788,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 6
@@ -12628,7 +11796,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 360,
+                "line" : 404,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0407_i6()"
               },
@@ -12639,7 +11807,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 7
@@ -12647,7 +11815,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 361,
+                "line" : 405,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0407_i7()"
               },
@@ -12658,7 +11826,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 8
@@ -12666,7 +11834,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 362,
+                "line" : 406,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0407_i8()"
               },
@@ -12677,7 +11845,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 9
@@ -12685,7 +11853,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 363,
+                "line" : 407,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0407_i9()"
               },
@@ -12696,7 +11864,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 10
@@ -12704,7 +11872,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 364,
+                "line" : 408,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0407_i10()"
               },
@@ -12715,7 +11883,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 11
@@ -12723,7 +11891,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 365,
+                "line" : 409,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0407_i11()"
               },
@@ -12734,7 +11902,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 12
@@ -12742,7 +11910,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 366,
+                "line" : 410,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0407_i12()"
               },
@@ -12753,7 +11921,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 13
@@ -12761,7 +11929,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 367,
+                "line" : 411,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0407_i13()"
               },
@@ -12772,7 +11940,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 14
@@ -12780,7 +11948,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 368,
+                "line" : 412,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0407_i14()"
               },
@@ -12791,7 +11959,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 15
@@ -12799,7 +11967,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 369,
+                "line" : 413,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0407_i15()"
               },
@@ -12810,7 +11978,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 16
@@ -12818,6 +11986,75 @@
           ]
         },
         {
+          "name" : "tbl_act_15",
+          "id" : 35,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [89],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_67",
+          "next_tables" : {
+            "act_16" : "node_67"
+          },
+          "default_entry" : {
+            "action_id" : 89,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_16",
+          "id" : 36,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [88],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_69",
+          "next_tables" : {
+            "act_15" : "node_69"
+          },
+          "default_entry" : {
+            "action_id" : 88,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 37,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [90],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_71",
+          "next_tables" : {
+            "act_17" : "node_71"
+          },
+          "default_entry" : {
+            "action_id" : 90,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_18",
           "id" : 38,
           "key" : [],
@@ -12827,83 +12064,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_66",
-          "next_tables" : {
-            "act_19" : "node_66"
-          },
-          "default_entry" : {
-            "action_id" : 97,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_19",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [96],
+          "action_ids" : [91],
           "actions" : ["act_18"],
-          "base_default_next" : "node_68",
-          "next_tables" : {
-            "act_18" : "node_68"
-          },
-          "default_entry" : {
-            "action_id" : 96,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 40,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [98],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_20" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 98,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_21",
-          "id" : 41,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [99],
-          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_21" : null
+            "act_18" : null
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12913,11 +12081,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_44",
-          "id" : 13,
+          "name" : "node_30",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -12943,14 +12111,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_45"
+          "false_next" : "node_31"
         },
         {
-          "name" : "node_45",
-          "id" : 14,
+          "name" : "node_31",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -12968,65 +12136,15 @@
               }
             }
           },
-          "true_next" : "node_46",
-          "false_next" : "node_51"
+          "true_next" : "node_32",
+          "false_next" : "node_35"
         },
         {
-          "name" : "node_46",
-          "id" : 15,
+          "name" : "node_32",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["vlan_tag", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_48"
-        },
-        {
-          "name" : "node_48",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -13078,15 +12196,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now",
-          "false_next" : "tbl_act_15"
+          "true_next" : "tbl_act_4",
+          "false_next" : "tbl_act_5"
         },
         {
-          "name" : "node_51",
-          "id" : 17,
+          "name" : "node_35",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -13131,15 +12249,218 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
+          "true_next" : "tbl_act_6",
+          "false_next" : "node_37"
+        },
+        {
+          "name" : "node_37",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 304,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_38",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_38",
+          "id" : 15,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 305,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_54",
+          "name" : "node_44",
+          "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_45",
+          "false_next" : "node_47"
+        },
+        {
+          "name" : "node_45",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_47"
+        },
+        {
+          "name" : "node_47",
           "id" : 18,
           "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 318,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_9",
+          "false_next" : "node_51"
+        },
+        {
+          "name" : "node_49",
+          "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_10",
+          "false_next" : "node_55"
+        },
+        {
+          "name" : "node_51",
+          "id" : 20,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 322,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_11",
+          "false_next" : "node_55"
+        },
+        {
+          "name" : "node_53",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_12",
+          "false_next" : "node_55"
+        },
+        {
+          "name" : "node_55",
+          "id" : 22,
+          "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 98,
+            "line" : 102,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port != 255 && ..."
           },
@@ -13212,14 +12533,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_55"
+          "true_next" : "node_56"
         },
         {
-          "name" : "node_55",
-          "id" : 19,
+          "name" : "node_56",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 102,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "fabric_metadata.int_meta.source == true"
           },
@@ -13245,14 +12566,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_57"
+          "false_next" : "node_58"
         },
         {
-          "name" : "node_57",
-          "id" : 20,
+          "name" : "node_58",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 106,
+            "line" : 110,
             "column" : 15,
             "source_fragment" : "hdr.int_header.isValid()"
           },
@@ -13268,14 +12589,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_16"
+          "true_next" : "tbl_act_13"
         },
         {
-          "name" : "node_60",
-          "id" : 21,
+          "name" : "node_61",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 375,
+            "line" : 419,
             "column" : 12,
             "source_fragment" : "fmeta.int_meta.transit == false"
           },
@@ -13300,12 +12621,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "node_62"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_63"
         },
         {
-          "name" : "node_62",
-          "id" : 22,
+          "name" : "node_63",
+          "id" : 26,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -13318,7 +12639,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
                   }
                 }
               }
@@ -13328,11 +12649,11 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_66",
-          "id" : 23,
+          "name" : "node_67",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 383,
+            "line" : 427,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -13347,15 +12668,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_68"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_69"
         },
         {
-          "name" : "node_68",
-          "id" : 24,
+          "name" : "node_69",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 386,
+            "line" : 430,
             "column" : 12,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -13370,15 +12691,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_70"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_71"
         },
         {
-          "name" : "node_70",
-          "id" : 25,
+          "name" : "node_71",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 389,
+            "line" : 433,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.isValid()"
           },
@@ -13394,7 +12715,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_21"
+          "true_next" : "tbl_act_18"
         }
       ]
     }
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index 6213234..6790d59 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -6,7 +6,7 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -14,12 +14,12 @@
     id: 16778827
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318787614
   size: 511
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -29,38 +29,34 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.vlan_tag.is_valid"
+    name: "vlan_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   action_refs {
-    id: 16835546
+    id: 16836487
   }
   action_refs {
-    id: 16793253
+    id: 16818236
   }
   action_refs {
-    id: 16798734
+    id: 16794911
   }
-  action_refs {
-    id: 16833700
-  }
-  const_default_action_id: 16835546
+  const_default_action_id: 16836487
   direct_resource_ids: 318815501
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -70,19 +66,19 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: EXACT
   }
@@ -92,7 +88,6 @@
   const_default_action_id: 16840921
   direct_resource_ids: 318827326
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -102,13 +97,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
@@ -116,12 +111,12 @@
     id: 16811012
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318770289
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -131,7 +126,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.mpls.label"
+    name: "mpls_label"
     bitwidth: 20
     match_type: EXACT
   }
@@ -139,12 +134,12 @@
     id: 16827758
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318830507
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -154,7 +149,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: LPM
   }
@@ -165,120 +160,119 @@
     id: 16804187
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318811107
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33574876
-    name: "FabricIngress.forwarding.acl"
+    id: 33618978
+    name: "FabricIngress.acl.acl"
     alias: "acl"
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "fabric_metadata.ip_proto"
+    name: "ip_proto"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 5
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_src"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 6
-    name: "hdr.ethernet.src_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 7
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   match_fields {
     id: 8
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 9
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 10
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 11
-    name: "hdr.icmp.icmp_type"
+    name: "icmp_type"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 12
-    name: "hdr.icmp.icmp_code"
+    name: "icmp_code"
     bitwidth: 8
     match_type: TERNARY
   }
   action_refs {
-    id: 16785374
+    id: 16807382
   }
   action_refs {
-    id: 16801806
+    id: 16829684
   }
   action_refs {
-    id: 16784835
+    id: 16790975
   }
   action_refs {
-    id: 16833260
+    id: 16820765
   }
   action_refs {
-    id: 16842570
+    id: 16827694
   }
-  const_default_action_id: 16842570
-  direct_resource_ids: 318772272
+  const_default_action_id: 16827694
+  direct_resource_ids: 318801025
   size: 128
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33562709
-    name: "FabricIngress.next.vlan_meta"
-    alias: "vlan_meta"
+    id: 33599709
+    name: "FabricIngress.next.next_vlan"
+    alias: "next_vlan"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
@@ -289,47 +283,41 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318785328
+  const_default_action_id: 16819938
+  direct_resource_ids: 318768144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33571723
-    name: "FabricIngress.next.simple"
-    alias: "simple"
+    id: 33596977
+    name: "FabricIngress.next.xconnect"
+    alias: "xconnect"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16802668
+    id: 16842190
   }
   action_refs {
-    id: 16808391
+    id: 16837052
   }
   action_refs {
-    id: 16780007
-  }
-  action_refs {
-    id: 16806134
-  }
-  action_refs {
-    id: 16795970
-  }
-  action_refs {
-    id: 16791579
-  }
-  action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318769096
+  const_default_action_id: 16819938
+  direct_resource_ids: 318778156
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -339,27 +327,27 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800211
+    id: 16815357
   }
   action_refs {
-    id: 16779239
+    id: 16791402
   }
   action_refs {
-    id: 16819349
+    id: 16779255
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  implementation_id: 285233747
+  const_default_action_id: 16819938
+  implementation_id: 285217164
   direct_resource_ids: 318800532
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -369,20 +357,20 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16789575
+    id: 16779917
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318801752
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -392,25 +380,25 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
@@ -418,12 +406,12 @@
     id: 16785857
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318800047
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -433,7 +421,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.int_header.is_valid"
+    name: "int_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
@@ -446,143 +434,6 @@
   }
   const_default_action_id: 16819938
   size: 1
-  idle_timeout_behavior: NO_TIMEOUT
-}
-tables {
-  preamble {
-    id: 33569467
-    name: "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
-    alias: "tb_int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16809886
-  }
-  action_refs {
-    id: 16783130
-  }
-  action_refs {
-    id: 16809096
-  }
-  action_refs {
-    id: 16834117
-  }
-  action_refs {
-    id: 16825314
-  }
-  action_refs {
-    id: 16811436
-  }
-  action_refs {
-    id: 16802199
-  }
-  action_refs {
-    id: 16796779
-  }
-  action_refs {
-    id: 16787676
-  }
-  action_refs {
-    id: 16825351
-  }
-  action_refs {
-    id: 16793999
-  }
-  action_refs {
-    id: 16786714
-  }
-  action_refs {
-    id: 16814203
-  }
-  action_refs {
-    id: 16807054
-  }
-  action_refs {
-    id: 16800064
-  }
-  action_refs {
-    id: 16792997
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 16
-  idle_timeout_behavior: NO_TIMEOUT
-  is_const_table: true
-}
-tables {
-  preamble {
-    id: 33595914
-    name: "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
-    alias: "tb_int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16819022
-  }
-  action_refs {
-    id: 16804144
-  }
-  action_refs {
-    id: 16829117
-  }
-  action_refs {
-    id: 16797781
-  }
-  action_refs {
-    id: 16813543
-  }
-  action_refs {
-    id: 16824974
-  }
-  action_refs {
-    id: 16815362
-  }
-  action_refs {
-    id: 16835399
-  }
-  action_refs {
-    id: 16834505
-  }
-  action_refs {
-    id: 16811493
-  }
-  action_refs {
-    id: 16825476
-  }
-  action_refs {
-    id: 16799777
-  }
-  action_refs {
-    id: 16829592
-  }
-  action_refs {
-    id: 16805877
-  }
-  action_refs {
-    id: 16780182
-  }
-  action_refs {
-    id: 16799476
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 16
-  idle_timeout_behavior: NO_TIMEOUT
-  is_const_table: true
 }
 tables {
   preamble {
@@ -592,13 +443,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "standard_metadata.egress_port"
+    name: "eg_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -609,16 +460,9 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318827144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
-  }
 }
 actions {
   preamble {
@@ -636,44 +480,32 @@
 }
 actions {
   preamble {
-    id: 16798734
-    name: "FabricIngress.filtering.drop"
-    alias: "filtering.drop"
+    id: 16836487
+    name: "FabricIngress.filtering.deny"
+    alias: "deny"
   }
 }
 actions {
   preamble {
-    id: 16793253
-    name: "FabricIngress.filtering.set_vlan"
-    alias: "filtering.set_vlan"
+    id: 16818236
+    name: "FabricIngress.filtering.permit"
+    alias: "permit"
+  }
+}
+actions {
+  preamble {
+    id: 16794911
+    name: "FabricIngress.filtering.permit_with_internal_vlan"
+    alias: "permit_with_internal_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16835546
-    name: "FabricIngress.filtering.push_internal_vlan"
-    alias: "push_internal_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16833700
-    name: "FabricIngress.filtering.nop_ingress_port_vlan"
-    alias: "nop_ingress_port_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16840921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
@@ -729,8 +561,8 @@
 }
 actions {
   preamble {
-    id: 16785374
-    name: "FabricIngress.forwarding.set_next_id_acl"
+    id: 16807382
+    name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
   }
   params {
@@ -741,29 +573,29 @@
 }
 actions {
   preamble {
-    id: 16801806
-    name: "FabricIngress.forwarding.punt_to_cpu"
+    id: 16829684
+    name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16784835
-    name: "FabricIngress.forwarding.clone_to_cpu"
+    id: 16790975
+    name: "FabricIngress.acl.clone_to_cpu"
     alias: "clone_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16833260
-    name: "FabricIngress.forwarding.drop"
-    alias: "forwarding.drop"
+    id: 16820765
+    name: "FabricIngress.acl.drop"
+    alias: "drop"
   }
 }
 actions {
   preamble {
-    id: 16842570
-    name: "FabricIngress.forwarding.nop_acl"
+    id: 16827694
+    name: "FabricIngress.acl.nop_acl"
     alias: "nop_acl"
   }
 }
@@ -771,19 +603,19 @@
   preamble {
     id: 16790685
     name: "FabricIngress.next.set_vlan"
-    alias: "next.set_vlan"
+    alias: "set_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16802668
-    name: "FabricIngress.next.output_simple"
-    alias: "output_simple"
+    id: 16842190
+    name: "FabricIngress.next.output_xconnect"
+    alias: "output_xconnect"
   }
   params {
     id: 1
@@ -793,26 +625,33 @@
 }
 actions {
   preamble {
-    id: 16808391
-    name: "FabricIngress.next.set_vlan_output"
-    alias: "set_vlan_output"
+    id: 16837052
+    name: "FabricIngress.next.set_next_id_xconnect"
+    alias: "set_next_id_xconnect"
   }
   params {
     id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16815357
+    name: "FabricIngress.next.output_hashed"
+    alias: "output_hashed"
   }
   params {
-    id: 2
+    id: 1
     name: "port_num"
     bitwidth: 9
   }
 }
 actions {
   preamble {
-    id: 16780007
-    name: "FabricIngress.next.l3_routing_simple"
-    alias: "l3_routing_simple"
+    id: 16791402
+    name: "FabricIngress.next.routing_hashed"
+    alias: "routing_hashed"
   }
   params {
     id: 1
@@ -832,9 +671,9 @@
 }
 actions {
   preamble {
-    id: 16806134
-    name: "FabricIngress.next.mpls_routing_v4_simple"
-    alias: "mpls_routing_v4_simple"
+    id: 16779255
+    name: "FabricIngress.next.mpls_routing_hashed"
+    alias: "mpls_routing_hashed"
   }
   params {
     id: 1
@@ -859,151 +698,21 @@
 }
 actions {
   preamble {
-    id: 16795970
-    name: "FabricIngress.next.mpls_routing_v6_simple"
-    alias: "mpls_routing_v6_simple"
+    id: 16779917
+    name: "FabricIngress.next.set_mcast_group_id"
+    alias: "set_mcast_group_id"
   }
   params {
     id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16791579
-    name: "FabricIngress.next.l3_routing_vlan"
-    alias: "l3_routing_vlan"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16800211
-    name: "FabricIngress.next.l3_routing_hashed"
-    alias: "l3_routing_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-}
-actions {
-  preamble {
-    id: 16779239
-    name: "FabricIngress.next.mpls_routing_v4_hashed"
-    alias: "mpls_routing_v4_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16819349
-    name: "FabricIngress.next.mpls_routing_v6_hashed"
-    alias: "mpls_routing_v6_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16789575
-    name: "FabricIngress.next.set_mcast_group"
-    alias: "set_mcast_group"
-  }
-  params {
-    id: 1
-    name: "gid"
+    name: "group_id"
     bitwidth: 16
   }
 }
 actions {
   preamble {
-    id: 16823970
-    name: "drop_now"
-    alias: "drop_now"
+    id: 16800567
+    name: "NoAction"
+    alias: "NoAction"
   }
 }
 actions {
@@ -1047,247 +756,16 @@
 }
 actions {
   preamble {
-    id: 16809886
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16783130
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16809096
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16834117
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16825314
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16811436
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16802199
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796779
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787676
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16825351
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16793999
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16786714
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16814203
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16807054
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13"
-    alias: "int_set_header_0003_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16800064
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16792997
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16819022
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16804144
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16829117
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16797781
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16813543
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16824974
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16815362
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16835399
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834505
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16811493
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16825476
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16799777
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16829592
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12"
-    alias: "int_set_header_0407_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16805877
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16780182
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16799476
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16801047
-    name: "FabricEgress.pkt_io_egress.pop_vlan"
-    alias: "pkt_io_egress.pop_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16790030
     name: "FabricEgress.egress_next.pop_vlan"
-    alias: "egress_next.pop_vlan"
+    alias: "pop_vlan"
   }
 }
 action_profiles {
   preamble {
-    id: 285233747
-    name: "FabricIngress.next.ecmp_selector"
-    alias: "ecmp_selector"
+    id: 285217164
+    name: "FabricIngress.next.hashed_selector"
+    alias: "hashed_selector"
   }
   table_ids: 33608588
   with_selector: true
@@ -1383,36 +861,36 @@
 }
 direct_counters {
   preamble {
-    id: 318772272
-    name: "FabricIngress.forwarding.acl_counter"
+    id: 318801025
+    name: "FabricIngress.acl.acl_counter"
     alias: "acl_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33574876
+  direct_table_id: 33618978
 }
 direct_counters {
   preamble {
-    id: 318785328
-    name: "FabricIngress.next.vlan_meta_counter"
-    alias: "vlan_meta_counter"
+    id: 318768144
+    name: "FabricIngress.next.next_vlan_counter"
+    alias: "next_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33562709
+  direct_table_id: 33599709
 }
 direct_counters {
   preamble {
-    id: 318769096
-    name: "FabricIngress.next.simple_counter"
-    alias: "simple_counter"
+    id: 318778156
+    name: "FabricIngress.next.xconnect_counter"
+    alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33571723
+  direct_table_id: 33596977
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 5672dc8..39b7f71 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -4,31 +4,35 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["last_ipv4_dscp", 6, false],
-        ["tmp", 4, false],
-        ["tmp_0", 8, false],
+        ["last_ipv4_dscp_0", 6, false],
+        ["tmp_0", 4, false],
+        ["tmp", 8, false],
         ["tmp_1", 32, false],
         ["tmp_2", 32, false],
-        ["spgw_ingress_tmp_1", 1, false],
-        ["spgw_ingress_tmp_2", 1, false],
-        ["filtering_tmp_0", 1, false],
-        ["next_tmp_2", 1, false],
-        ["next_tmp_3", 1, false],
-        ["next_tmp_4", 1, false],
-        ["spgw_normalizer_hasReturned_0", 1, false],
-        ["spgw_ingress_hasReturned_0", 1, false],
-        ["next_hasReturned_0", 1, false],
-        ["process_int_main_process_int_transit_hasReturned_0", 1, false],
+        ["spgw_ingress_tmp", 1, false],
+        ["spgw_ingress_tmp_0", 1, false],
+        ["spgw_normalizer_hasReturned", 1, false],
+        ["spgw_ingress_hasReturned", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["process_int_main_process_int_transit_hasReturned", 1, false],
+        ["fabric_metadata_t.eth_type", 16, false],
+        ["fabric_metadata_t.ip_eth_type", 16, false],
+        ["fabric_metadata_t.vlan_id", 12, false],
+        ["fabric_metadata_t.vlan_pri", 3, false],
+        ["fabric_metadata_t.vlan_cfi", 1, false],
+        ["fabric_metadata_t.mpls_label", 20, false],
+        ["fabric_metadata_t.mpls_ttl", 8, false],
+        ["fabric_metadata_t.skip_forwarding", 1, false],
+        ["fabric_metadata_t.skip_next", 1, false],
         ["fabric_metadata_t.fwd_type", 3, false],
         ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.pop_vlan_when_packet_in", 1, false],
         ["fabric_metadata_t.is_multicast", 1, false],
         ["fabric_metadata_t.is_controller_packet_out", 1, false],
         ["fabric_metadata_t.clone_to_cpu", 1, false],
         ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_src_port", 16, false],
-        ["fabric_metadata_t.l4_dst_port", 16, false],
-        ["_padding_2", 5, false]
+        ["fabric_metadata_t.l4_sport", 16, false],
+        ["fabric_metadata_t.l4_dport", 16, false],
+        ["_padding_2", 4, false]
       ]
     },
     {
@@ -65,7 +69,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -75,7 +79,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -111,8 +115,8 @@
       "name" : "udp_t",
       "id" : 6,
       "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["len", 16, false],
         ["checksum", 16, false]
       ]
@@ -133,22 +137,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 8,
       "fields" : [
-        ["hw_type", 16, false],
-        ["proto_type", 16, false],
-        ["hw_addr_len", 8, false],
-        ["proto_addr_len", 8, false],
-        ["opcode", 16, false]
-      ]
-    },
-    {
-      "name" : "tcp_t",
-      "id" : 9,
-      "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["seq_no", 32, false],
         ["ack_no", 32, false],
         ["data_offset", 4, false],
@@ -162,7 +155,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 10,
+      "id" : 9,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -174,7 +167,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -182,7 +175,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -190,7 +183,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 13,
+      "id" : 12,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -200,7 +193,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 14,
+      "id" : 13,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -219,14 +212,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 15,
+      "id" : 14,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 16,
+      "id" : 15,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -234,14 +227,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 17,
+      "id" : 16,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 18,
+      "id" : 17,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -249,21 +242,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 19,
+      "id" : 18,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 20,
+      "id" : 19,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 21,
+      "id" : 20,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -271,14 +264,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 22,
+      "id" : 21,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 23,
+      "id" : 22,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -288,7 +281,7 @@
     },
     {
       "name" : "spgw_meta_t",
-      "id" : 24,
+      "id" : 23,
       "fields" : [
         ["direction", 2, false],
         ["ipv4_len", 16, false],
@@ -300,7 +293,7 @@
     },
     {
       "name" : "int_metadata_t",
-      "id" : 25,
+      "id" : 24,
       "fields" : [
         ["source", 1, 0],
         ["transit", 1, 0],
@@ -344,58 +337,58 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "inner_vlan_tag",
       "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 5,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 5,
+      "id" : 6,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_ipv4",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 10,
-      "header_type" : "ipv4_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 11,
-      "header_type" : "arp_t",
+      "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -605,6 +598,32 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -622,12 +641,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -641,7 +654,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -662,12 +675,52 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -687,13 +740,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["inner_vlan_tag", "eth_type"]
             }
           ]
         },
         {
           "name" : "parse_mpls",
-          "id" : 4,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -708,7 +761,33 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -734,13 +813,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -768,7 +847,20 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -811,29 +903,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 6,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 7,
           "parser_ops" : [
@@ -850,11 +919,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "src_port"]
+                  "value" : ["tcp", "sport"]
                 }
               ],
               "op" : "set"
@@ -863,11 +932,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "dst_port"]
+                  "value" : ["tcp", "dport"]
                 }
               ],
               "op" : "set"
@@ -899,11 +968,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "src_port"]
+                  "value" : ["udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -912,11 +981,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "dst_port"]
+                  "value" : ["udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -938,7 +1007,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -973,7 +1042,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp"]
                 },
                 {
                   "type" : "expression",
@@ -1032,7 +1101,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             }
           ]
         },
@@ -1062,7 +1131,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -1121,11 +1190,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "src_port"]
+                  "value" : ["inner_udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -1134,11 +1203,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "dst_port"]
+                  "value" : ["inner_udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -1173,7 +1242,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "last_ipv4_dscp"]
+              "value" : ["scalars", "last_ipv4_dscp_0"]
             }
           ]
         },
@@ -1266,11 +1335,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
     }
   ],
   "meter_arrays" : [],
@@ -1306,7 +1375,7 @@
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 34,
+        "line" : 31,
         "column" : 50,
         "source_fragment" : "ingress_port_vlan_counter"
       }
@@ -1318,7 +1387,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -1330,7 +1399,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -1342,7 +1411,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1354,45 +1423,45 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 80,
+        "line" : 82,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
     },
     {
-      "name" : "FabricIngress.forwarding.acl_counter",
+      "name" : "FabricIngress.acl.acl_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
+      "binding" : "FabricIngress.acl.acl",
       "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
         "column" : 50,
         "source_fragment" : "acl_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 8,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.vlan_meta",
+      "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 58,
+        "line" : 67,
         "column" : 50,
-        "source_fragment" : "vlan_meta_counter"
+        "source_fragment" : "next_vlan_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.simple_counter",
+      "name" : "FabricIngress.next.xconnect_counter",
       "id" : 9,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.simple",
+      "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 91,
         "column" : 50,
-        "source_fragment" : "simple_counter"
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
@@ -1402,7 +1471,7 @@
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
@@ -1414,7 +1483,7 @@
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
@@ -1424,7 +1493,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -1436,7 +1505,7 @@
       "id" : 13,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -1462,7 +1531,7 @@
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -1536,7 +1605,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1657,55 +1726,55 @@
   "learn_lists" : [],
   "actions" : [
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 0,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 1,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 2,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 3,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 4,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 5,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 6,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 7,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 8,
       "runtime_data" : [],
       "primitives" : []
@@ -1717,35 +1786,8 @@
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 10,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricIngress.spgw_ingress.gtpu_decap",
-      "id" : 11,
+      "id" : 10,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1758,7 +1800,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 54,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
           }
@@ -1773,7 +1815,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
           }
@@ -1788,7 +1830,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
           }
@@ -1797,7 +1839,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
-      "id" : 12,
+      "id" : 11,
       "runtime_data" : [
         {
           "name" : "teid",
@@ -1827,9 +1869,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 62,
+            "line" : 63,
             "column" : 8,
-            "source_fragment" : "spgw_meta.teid = teid"
+            "source_fragment" : "fabric_meta.spgw.teid = teid"
           }
         },
         {
@@ -1846,9 +1888,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 63,
+            "line" : 64,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
           }
         },
         {
@@ -1865,16 +1907,16 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 64,
+            "line" : 65,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 13,
+      "id" : 12,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1909,179 +1951,16 @@
       ]
     },
     {
-      "name" : "FabricIngress.filtering.drop",
-      "id" : 14,
+      "name" : "FabricIngress.filtering.deny",
+      "id" : 13,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 15,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 16,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "cfi"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "pri"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 52,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 99,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
+              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -2100,22 +1979,82 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
+            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 17,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 14,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 15,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 18,
+      "id" : 16,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2137,7 +2076,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -2146,6 +2085,87 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
+      "id" : 17,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "id" : 18,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
       "id" : 19,
       "runtime_data" : [
         {
@@ -2168,61 +2188,21 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 37,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "name" : "FabricIngress.forwarding.nop_routing_v4",
       "id" : 20,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 61,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
+      "runtime_data" : [],
+      "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
+      "name" : "FabricIngress.acl.set_next_id_acl",
       "id" : 21,
       "runtime_data" : [
         {
@@ -2244,8 +2224,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -2253,46 +2233,9 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_routing_v4",
+      "name" : "FabricIngress.acl.punt_to_cpu",
       "id" : 22,
       "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
-      "id" : 23,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
-      "id" : 24,
-      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
@@ -2307,27 +2250,46 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 116,
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
         },
         {
-          "op" : "exit",
-          "parameters" : [],
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 118,
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
             "column" : 8,
-            "source_fragment" : "exit"
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.clone_to_cpu",
-      "id" : 25,
+      "name" : "FabricIngress.acl.clone_to_cpu",
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2353,8 +2315,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 123,
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "fabric_metadata.clone_to_cpu = true"
           }
@@ -2362,34 +2324,63 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
-      "id" : 26,
+      "name" : "FabricIngress.acl.drop",
+      "id" : 24,
       "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 128,
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
+          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_acl",
-      "id" : 27,
+      "name" : "FabricIngress.acl.nop_acl",
+      "id" : 25,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 28,
+      "id" : 26,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
+          "name" : "vlan_id",
           "bitwidth" : 12
         }
       ],
@@ -2399,7 +2390,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
             },
             {
               "type" : "runtime_data",
@@ -2408,15 +2399,77 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 61,
+            "line" : 70,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.output_simple",
+      "name" : "FabricIngress.next.output_xconnect",
+      "id" : 27,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 28,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
       "id" : 29,
       "runtime_data" : [
         {
@@ -2439,24 +2492,28 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.set_vlan_output",
+      "name" : "FabricIngress.next.routing_hashed",
       "id" : 30,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
           "name" : "port_num",
           "bitwidth" : 9
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "dmac",
+          "bitwidth" : 48
         }
       ],
       "primitives" : [
@@ -2465,18 +2522,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["ethernet", "src_addr"]
             },
             {
               "type" : "runtime_data",
-              "value" : 0
+              "value" : 1
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 90,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "dst_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
           }
         },
         {
@@ -2488,20 +2564,20 @@
             },
             {
               "type" : "runtime_data",
-              "value" : 1
+              "value" : 0
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_simple",
+      "name" : "FabricIngress.next.mpls_routing_hashed",
       "id" : 31,
       "runtime_data" : [
         {
@@ -2515,6 +2591,10 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -2523,6 +2603,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -2532,7 +2631,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2570,960 +2669,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_simple",
+      "name" : "FabricIngress.next.set_mcast_group_id",
       "id" : 32,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_simple",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_vlan",
-      "id" : 34,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_hashed",
-      "id" : 35,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
-      "id" : 36,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 37,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 38,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -3542,9 +2700,9 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "standard_metadata.mcast_grp = gid"
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
         },
         {
@@ -3571,7 +2729,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -3580,7 +2738,7 @@
     },
     {
       "name" : "act",
-      "id" : 39,
+      "id" : 33,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3588,7 +2746,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3616,7 +2774,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 40,
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3629,7 +2787,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -3644,7 +2802,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -3654,7 +2812,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3676,7 +2834,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 41,
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3702,7 +2860,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 42,
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3724,7 +2882,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 43,
+      "id" : 37,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3788,7 +2946,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 44,
+      "id" : 38,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3805,7 +2963,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 26,
+            "line" : 25,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
           }
@@ -3820,7 +2978,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -3849,7 +3007,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -3858,7 +3016,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 45,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3866,7 +3024,116 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 103,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_6",
+      "id" : 40,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x41"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 113,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
+      "id" : 41,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -3887,8 +3154,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 46,
+      "name" : "act_8",
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3896,7 +3163,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -3917,8 +3184,25 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 47,
+      "name" : "act_9",
+      "id" : 43,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 148,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3935,7 +3219,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 137,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -3943,94 +3227,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 48,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
-      "id" : 49,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 50,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x02"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 130,
-            "column" : 38,
-            "source_fragment" : "2w2; ..."
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_11",
-      "id" : 51,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4038,26 +3236,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 37,
-            "source_fragment" : "2w0; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4073,19 +3252,13 @@
                 }
               }
             }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 153,
-            "column" : 12,
-            "source_fragment" : "return"
-          }
+          ]
         }
       ]
     },
     {
       "name" : "act_12",
-      "id" : 52,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4093,7 +3266,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -4115,7 +3288,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 53,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4123,25 +3296,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["userMetadata.spgw", "direction"]
             },
             {
-              "type" : "field",
-              "value" : ["ipv4", "total_len"]
+              "type" : "hexstr",
+              "value" : "0x02"
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 170,
-            "column" : 8,
-            "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
+            "filename" : "include/control/../define.p4",
+            "line" : 138,
+            "column" : 38,
+            "source_fragment" : "2w2; ..."
           }
         }
       ]
     },
     {
       "name" : "act_14",
-      "id" : 54,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4149,7 +3322,26 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["userMetadata.spgw", "direction"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 136,
+            "column" : 37,
+            "source_fragment" : "2w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4165,13 +3357,19 @@
                 }
               }
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 157,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
         }
       ]
     },
     {
       "name" : "act_15",
-      "id" : 55,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4179,7 +3377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -4201,7 +3399,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 56,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4209,346 +3407,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["userMetadata.spgw", "ipv4_len"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x07"
+              "type" : "field",
+              "value" : ["ipv4", "total_len"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 119,
-            "column" : 31,
-            "source_fragment" : "7; ..."
+            "filename" : "include/spgw.p4",
+            "line" : 174,
+            "column" : 8,
+            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
           }
         }
       ]
     },
     {
       "name" : "act_17",
-      "id" : 57,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 102,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_18",
-      "id" : 58,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 59,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 60,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_21",
-      "id" : 61,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_22",
-      "id" : 62,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_23",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_24",
-      "id" : 64,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_25",
-      "id" : 65,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 223,
-            "column" : 20,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_26",
-      "id" : 66,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv4", "ttl"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv4", "ttl"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 230,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_27",
-      "id" : 67,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4578,7 +3455,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
           }
@@ -4597,7 +3474,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
           }
@@ -4605,8 +3482,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 68,
+      "name" : "act_18",
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4636,7 +3513,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
           }
@@ -4655,7 +3532,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
           }
@@ -4663,92 +3540,38 @@
       ]
     },
     {
-      "name" : "NoAction",
-      "id" : 69,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 70,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 71,
+      "name" : "nop",
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 72,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 73,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 74,
+      "name" : "NoAction",
+      "id" : 56,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 75,
+      "name" : "NoAction",
+      "id" : 57,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 76,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4761,7 +3584,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 185,
+            "line" : 190,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
           }
@@ -4780,7 +3603,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 186,
+            "line" : 191,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
           }
@@ -4799,7 +3622,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 111,
+            "line" : 119,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -4818,7 +3641,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 188,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dscp = 0"
           }
@@ -4837,7 +3660,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 189,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.ecn = 0"
           }
@@ -4879,7 +3702,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 190,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
           }
@@ -4898,7 +3721,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 192,
+            "line" : 197,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
           }
@@ -4917,7 +3740,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 193,
+            "line" : 198,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
           }
@@ -4936,7 +3759,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 194,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
           }
@@ -4955,7 +3778,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -4974,7 +3797,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4993,9 +3816,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 197,
+            "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
           }
         },
         {
@@ -5012,9 +3835,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 198,
+            "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
           }
         },
         {
@@ -5031,7 +3854,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 199,
+            "line" : 204,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
           }
@@ -5046,7 +3869,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 201,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
           }
@@ -5056,7 +3879,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "src_port"]
+              "value" : ["gtpu_udp", "sport"]
             },
             {
               "type" : "hexstr",
@@ -5065,9 +3888,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 202,
+            "line" : 207,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.src_port = 2152"
+            "source_fragment" : "gtpu_udp.sport = 2152"
           }
         },
         {
@@ -5075,7 +3898,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "dst_port"]
+              "value" : ["gtpu_udp", "dport"]
             },
             {
               "type" : "hexstr",
@@ -5084,9 +3907,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 203,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.dst_port = 2152"
+            "source_fragment" : "gtpu_udp.dport = 2152"
           }
         },
         {
@@ -5126,9 +3949,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 204,
+            "line" : 209,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
+            "source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
           }
         },
         {
@@ -5145,7 +3968,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 206,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
           }
@@ -5160,7 +3983,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 208,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
           }
@@ -5179,7 +4002,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 209,
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
           }
@@ -5198,7 +4021,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 210,
+            "line" : 215,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
           }
@@ -5217,7 +4040,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 211,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
           }
@@ -5236,7 +4059,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 212,
+            "line" : 217,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
           }
@@ -5255,7 +4078,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 213,
+            "line" : 218,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
           }
@@ -5274,7 +4097,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 214,
+            "line" : 219,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
           }
@@ -5293,7 +4116,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 215,
+            "line" : 220,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
           }
@@ -5312,9 +4135,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 216,
+            "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
           }
         },
         {
@@ -5331,16 +4154,16 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 217,
+            "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = spgw_meta.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
           }
         }
       ]
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 77,
+      "id" : 59,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -5370,7 +4193,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setValid()"
           }
@@ -5389,7 +4212,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 33,
+            "line" : 34,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.int_type = 1"
           }
@@ -5408,7 +4231,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 139,
+            "line" : 147,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -5423,7 +4246,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setValid()"
           }
@@ -5442,7 +4265,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ver = 0"
           }
@@ -5461,7 +4284,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 38,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rep = 0"
           }
@@ -5480,7 +4303,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 39,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.int_header.c = 0"
           }
@@ -5499,7 +4322,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_header.e = 0"
           }
@@ -5518,7 +4341,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rsvd1 = 0"
           }
@@ -5537,7 +4360,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 42,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ins_cnt = ins_cnt; ..."
           }
@@ -5556,7 +4379,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 43,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.int_header.max_hop_cnt = max_hop; ..."
           }
@@ -5575,7 +4398,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 44,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = 0"
           }
@@ -5594,7 +4417,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 45,
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0003 = ins_mask0003; ..."
           }
@@ -5613,7 +4436,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 46,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0407 = ins_mask0407; ..."
           }
@@ -5632,7 +4455,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 47,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0811 = 0"
           }
@@ -5651,7 +4474,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 48,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_1215 = 0"
           }
@@ -5666,7 +4489,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setValid()"
           }
@@ -5685,7 +4508,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 51,
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.next_proto = hdr.ipv4.protocol"
           }
@@ -5699,14 +4522,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 52,
+            "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dst_port"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
           }
         },
         {
@@ -5723,7 +4546,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 53,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.dscp = hdr.ipv4.dscp"
           }
@@ -5765,7 +4588,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + INT_HEADER_LEN_BYTES"
           }
@@ -5807,7 +4630,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + INT_HEADER_LEN_BYTES"
           }
@@ -5826,7 +4649,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 143,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -5835,7 +4658,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 78,
+      "id" : 60,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -5895,13 +4718,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 79,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 80,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5914,7 +4737,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -5933,7 +4756,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5965,7 +4788,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6007,7 +4830,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6049,7 +4872,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6058,7 +4881,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 81,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6071,7 +4894,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6090,7 +4913,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6132,7 +4955,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6174,7 +4997,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6183,7 +5006,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 82,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6196,7 +5019,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6215,7 +5038,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6247,7 +5070,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6262,7 +5085,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6281,7 +5104,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6323,7 +5146,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6365,7 +5188,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6374,7 +5197,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 83,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6387,7 +5210,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6419,7 +5242,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6451,7 +5274,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6493,7 +5316,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -6535,7 +5358,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -6544,7 +5367,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 84,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6557,7 +5380,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6576,7 +5399,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6608,7 +5431,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6623,7 +5446,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6655,7 +5478,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6687,7 +5510,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6729,7 +5552,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6771,7 +5594,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6780,7 +5603,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 85,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6793,7 +5616,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6812,7 +5635,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6827,7 +5650,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6859,7 +5682,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6891,7 +5714,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6933,7 +5756,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6975,7 +5798,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6984,7 +5807,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 86,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6997,7 +5820,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7016,7 +5839,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7048,7 +5871,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7063,7 +5886,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7082,7 +5905,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7097,7 +5920,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7129,7 +5952,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7161,7 +5984,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7203,7 +6026,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -7245,7 +6068,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -7254,7 +6077,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 87,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7267,7 +6090,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7286,7 +6109,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7328,7 +6151,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7370,7 +6193,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7379,7 +6202,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 88,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7392,7 +6215,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7411,7 +6234,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7443,7 +6266,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7458,7 +6281,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7477,7 +6300,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7519,7 +6342,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7561,7 +6384,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7570,7 +6393,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 89,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7583,7 +6406,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7602,7 +6425,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7617,7 +6440,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7636,7 +6459,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7678,7 +6501,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7720,7 +6543,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7729,7 +6552,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 90,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7742,7 +6565,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7761,7 +6584,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7793,7 +6616,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7808,7 +6631,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7827,7 +6650,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7842,7 +6665,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7861,7 +6684,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7903,7 +6726,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -7945,7 +6768,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -7954,7 +6777,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 91,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7967,7 +6790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7999,7 +6822,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8031,7 +6854,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8046,7 +6869,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8065,7 +6888,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8107,7 +6930,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8149,7 +6972,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8158,7 +6981,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 92,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8171,7 +6994,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8190,7 +7013,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8222,7 +7045,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -8237,7 +7060,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8269,7 +7092,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8301,7 +7124,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8316,7 +7139,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8335,7 +7158,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8377,7 +7200,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8419,7 +7242,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8428,7 +7251,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 93,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8441,7 +7264,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8460,7 +7283,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8475,7 +7298,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8507,7 +7330,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8539,7 +7362,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8554,7 +7377,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8573,7 +7396,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8615,7 +7438,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8657,7 +7480,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8666,7 +7489,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 94,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8679,7 +7502,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -8698,7 +7521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -8730,7 +7553,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -8745,7 +7568,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -8764,7 +7587,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -8779,7 +7602,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -8811,7 +7634,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -8843,7 +7666,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -8858,7 +7681,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -8877,7 +7700,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -8919,7 +7742,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -8961,7 +7784,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -8970,13 +7793,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 95,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 96,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8989,7 +7812,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9008,7 +7831,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9050,7 +7873,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -9092,7 +7915,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -9101,7 +7924,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 97,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9114,7 +7937,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9133,7 +7956,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9152,7 +7975,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9194,7 +8017,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -9236,7 +8059,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -9245,7 +8068,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 98,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9258,7 +8081,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9277,7 +8100,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9292,7 +8115,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9311,7 +8134,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9330,7 +8153,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9372,7 +8195,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9414,7 +8237,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9423,7 +8246,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 99,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9436,7 +8259,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9478,7 +8301,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9520,7 +8343,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -9562,7 +8385,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -9571,7 +8394,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 100,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9584,7 +8407,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9603,7 +8426,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9618,7 +8441,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9660,7 +8483,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9702,7 +8525,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9744,7 +8567,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9753,7 +8576,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 101,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9766,7 +8589,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9785,7 +8608,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9804,7 +8627,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9819,7 +8642,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9861,7 +8684,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9903,7 +8726,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9945,7 +8768,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9954,7 +8777,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 102,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9967,7 +8790,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9986,7 +8809,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10001,7 +8824,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10020,7 +8843,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10039,7 +8862,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10054,7 +8877,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10096,7 +8919,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10138,7 +8961,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -10180,7 +9003,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -10189,7 +9012,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 103,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10202,7 +9025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10221,7 +9044,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10263,7 +9086,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -10305,7 +9128,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -10314,7 +9137,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 104,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10327,7 +9150,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10346,7 +9169,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10361,7 +9184,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10380,7 +9203,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10422,7 +9245,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10464,7 +9287,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10473,7 +9296,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 105,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10486,7 +9309,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10505,7 +9328,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10524,7 +9347,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10539,7 +9362,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10558,7 +9381,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10600,7 +9423,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -10642,7 +9465,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -10651,7 +9474,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 106,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10664,7 +9487,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -10683,7 +9506,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -10698,7 +9521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -10717,7 +9540,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -10736,7 +9559,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10751,7 +9574,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10770,7 +9593,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10812,7 +9635,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -10854,7 +9677,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -10863,7 +9686,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 107,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10876,7 +9699,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10918,7 +9741,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10933,7 +9756,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10952,7 +9775,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10994,7 +9817,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -11036,7 +9859,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -11045,7 +9868,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 108,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11058,7 +9881,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11077,7 +9900,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11092,7 +9915,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11134,7 +9957,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11149,7 +9972,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11168,7 +9991,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11210,7 +10033,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11252,7 +10075,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11261,7 +10084,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 109,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11274,7 +10097,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11293,7 +10116,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11312,7 +10135,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11327,7 +10150,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11369,7 +10192,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11384,7 +10207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11403,7 +10226,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11445,7 +10268,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -11487,7 +10310,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -11496,7 +10319,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 110,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11509,7 +10332,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -11528,7 +10351,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -11543,7 +10366,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -11562,7 +10385,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -11581,7 +10404,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -11596,7 +10419,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -11638,7 +10461,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -11653,7 +10476,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -11672,7 +10495,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -11714,7 +10537,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -11756,7 +10579,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -11764,68 +10587,302 @@
       ]
     },
     {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 111,
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 40,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
           "op" : "remove_header",
           "parameters" : [
             {
               "type" : "header",
-              "value" : "vlan_tag"
+              "value" : "mpls"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 41,
+            "filename" : "include/control/next.p4",
+            "line" : 246,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+            "source_fragment" : "hdr.mpls.setInvalid()"
           }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 112,
-      "runtime_data" : [],
-      "primitives" : [
+        },
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 248,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 94,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 253,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 255,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 256,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 257,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 95,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 266,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 267,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 269,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 96,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 280,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
           }
         },
         {
@@ -11838,7 +10895,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -11846,8 +10903,25 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 113,
+      "name" : "act_19",
+      "id" : 97,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_20",
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11860,7 +10934,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 57,
+            "line" : 49,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -11879,7 +10953,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 58,
+            "line" : 50,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -11887,8 +10961,25 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 114,
+      "name" : "act_21",
+      "id" : 99,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_22",
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11896,7 +10987,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_23",
+      "id" : 101,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -11917,8 +11038,25 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 115,
+      "name" : "act_24",
+      "id" : 102,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_25",
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11926,7 +11064,152 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_26",
+      "id" : 104,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_27",
+      "id" : 105,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 323,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_28",
+      "id" : 106,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_29",
+      "id" : 107,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -11945,7 +11228,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 376,
+            "line" : 420,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -11953,8 +11236,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 116,
+      "name" : "act_30",
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11994,7 +11277,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 384,
+            "line" : 428,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
           }
@@ -12002,8 +11285,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 117,
+      "name" : "act_31",
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12043,7 +11326,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 381,
+            "line" : 425,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
           }
@@ -12051,8 +11334,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 118,
+      "name" : "act_32",
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12092,7 +11375,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 387,
+            "line" : 431,
             "column" : 12,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
           }
@@ -12100,8 +11383,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 119,
+      "name" : "act_33",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12141,7 +11424,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 390,
+            "line" : 434,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
           }
@@ -12155,7 +11438,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -12171,14 +11454,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [34],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 34,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12194,14 +11477,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
+          "action_ids" : [33],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 33,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12217,14 +11500,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [37],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 37,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12240,14 +11523,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
+          "action_ids" : [35],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12263,14 +11546,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
+          "action_ids" : [36],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 36,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12286,14 +11569,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
+          "action_ids" : [38],
           "actions" : ["act_4"],
           "base_default_next" : null,
           "next_tables" : {
             "act_4" : null
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 38,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12309,14 +11592,158 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_13",
+          "action_ids" : [39],
+          "actions" : ["act_5"],
+          "base_default_next" : "node_14",
           "next_tables" : {
-            "act_12" : "node_13"
+            "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 39,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_6",
+          "id" : 7,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [40],
+          "actions" : ["act_6"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 40,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 51,
+            "column" : 10,
+            "source_fragment" : "ingress_port_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "vlan_is_valid",
+              "target" : ["vlan_tag", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [13, 14, 15],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+          "next_tables" : {
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
+          },
+          "default_entry" : {
+            "action_id" : 13,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.fwd_classifier",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 86,
+            "column" : 10,
+            "source_fragment" : "fwd_classifier"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_dst",
+              "target" : ["ethernet", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [16],
+          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
+          "base_default_next" : "tbl_act_7",
+          "next_tables" : {
+            "FabricIngress.filtering.set_forwarding_type" : "tbl_act_7"
+          },
+          "default_entry" : {
+            "action_id" : 16,
+            "action_const" : true,
+            "action_data" : ["0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 10,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [49],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "act_15" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12324,17 +11751,17 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
-          "id" : 7,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 79,
+            "line" : 82,
             "column" : 10,
             "source_fragment" : "s1u_filter_table"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "gtpu_ipv4.dst_addr",
+              "name" : "gtp_ipv4_dst",
               "target" : ["gtpu_ipv4", "dst_addr"],
               "mask" : null
             }
@@ -12346,22 +11773,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [1],
-          "actions" : ["NoAction"],
+          "actions" : ["nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_6",
-            "__MISS__" : "tbl_act_7"
+            "__HIT__" : "tbl_act_8",
+            "__MISS__" : "tbl_act_9"
           },
           "default_entry" : {
             "action_id" : 1,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 8,
+          "name" : "tbl_act_8",
+          "id" : 12,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12369,22 +11796,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_17",
+          "action_ids" : [41],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_5" : "node_17"
+            "act_7" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 9,
+          "name" : "tbl_act_9",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12392,22 +11819,68 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_17",
+          "action_ids" : [42],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_17"
+            "act_8" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 10,
+          "name" : "tbl_act_10",
+          "id" : 14,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [43],
+          "actions" : ["act_9"],
+          "base_default_next" : "tbl_act_11",
+          "next_tables" : {
+            "act_9" : "tbl_act_11"
+          },
+          "default_entry" : {
+            "action_id" : 43,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_11",
+          "id" : 15,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [44],
+          "actions" : ["act_10"],
+          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
+          "next_tables" : {
+            "act_10" : "tbl_spgw_ingress_gtpu_decap"
+          },
+          "default_entry" : {
+            "action_id" : 44,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_ingress_gtpu_decap",
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12416,10 +11889,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [10],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_8",
+          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "drop_now" : "tbl_act_8"
+            "FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
           },
           "default_entry" : {
             "action_id" : 10,
@@ -12429,64 +11902,18 @@
           }
         },
         {
-          "name" : "tbl_act_8",
-          "id" : 11,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_7"],
-          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
-          "next_tables" : {
-            "act_7" : "tbl_spgw_ingress_gtpu_decap"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_ingress_gtpu_decap",
-          "id" : 12,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [11],
-          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 11,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
-          "id" : 13,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 68,
+            "line" : 69,
             "column" : 10,
             "source_fragment" : "dl_sess_lookup"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -12497,84 +11924,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12, 0],
-          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
+          "action_ids" : [11, 0],
+          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
+            "__HIT__" : "tbl_act_12",
+            "__MISS__" : "tbl_act_13"
           },
           "default_entry" : {
             "action_id" : 0,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 14,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_8" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 48,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 15,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_9" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 49,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 16,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_10" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12582,29 +11940,6 @@
         },
         {
           "name" : "tbl_act_12",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_11" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 51,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
           "id" : 18,
           "key" : [],
           "match_type" : "exact",
@@ -12613,65 +11948,39 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_13"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "action_ids" : [45],
+          "actions" : ["act_11"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "act_13" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_11" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "name" : "tbl_act_13",
           "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 66,
-            "column" : 10,
-            "source_fragment" : "ingress_port_vlan"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.is_valid",
-              "target" : ["vlan_tag", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
+          "key" : [],
+          "match_type" : "exact",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : true,
+          "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 15, 14, 17],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
+          "action_ids" : [46],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "__HIT__" : "tbl_act_14",
-            "__MISS__" : "tbl_act_15"
+            "act_12" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 16,
+            "action_id" : 46,
             "action_const" : true,
-            "action_data" : ["0xffe"],
+            "action_data" : [],
             "action_entry_const" : true
           }
         },
@@ -12685,14 +11994,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_32",
+          "action_ids" : [47],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_14" : "node_32"
+            "act_13" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12708,70 +12017,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_32",
+          "action_ids" : [48],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_15" : "node_32"
+            "act_14" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 22,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 103,
-            "column" : 10,
-            "source_fragment" : "fwd_classifier"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
-              "target" : ["ethernet", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [18],
-          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 18,
-            "action_const" : true,
-            "action_data" : ["0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_16",
-          "id" : 23,
+          "id" : 22,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12779,14 +12040,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
+          "action_ids" : [50],
           "actions" : ["act_16"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "act_16" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12794,23 +12055,23 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 24,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 10,
             "source_fragment" : "bridging"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -12821,34 +12082,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 3],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [17, 3],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 3,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 25,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "mpls"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.mpls.label",
-              "target" : ["mpls", "label"],
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
               "mask" : null
             }
           ],
@@ -12858,38 +12119,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [20, 4],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_17",
+          "action_ids" : [18, 4],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_17",
-            "NoAction" : "tbl_act_17"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 4,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_17",
-          "id" : 26,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [57],
-          "actions" : ["act_17"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_17" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12897,17 +12135,17 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 27,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 91,
+            "line" : 93,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -12918,100 +12156,100 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 22, 5],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [19, 20, 5],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
-            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 5,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 28,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 26,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 136,
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
             "column" : 10,
             "source_fragment" : "acl"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.ip_proto",
+              "name" : "ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_src",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.src_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_type",
+              "name" : "icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_code",
+              "name" : "icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -13022,26 +12260,178 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 24, 25, 26, 27],
-          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [21, 22, 23, 24, 25],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_43",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_18",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.drop" : "tbl_act_18",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_18"
+            "FabricIngress.acl.set_next_id_acl" : "node_43",
+            "FabricIngress.acl.punt_to_cpu" : "node_43",
+            "FabricIngress.acl.clone_to_cpu" : "node_43",
+            "FabricIngress.acl.drop" : "node_43",
+            "FabricIngress.acl.nop_acl" : "node_43"
           },
           "default_entry" : {
-            "action_id" : 27,
+            "action_id" : 25,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [27, 28, 7],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.hashed",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 7,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 180,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [29, 30, 31, 8],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
           "id" : 29,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [32, 9],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 9,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [26, 6],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_48",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_48",
+            "nop" : "node_48"
+          },
+          "default_entry" : {
+            "action_id" : 6,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 31,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13049,95 +12439,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_18"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [51],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "act_18" : "FabricIngress.next.vlan_meta"
+            "act_17" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 30,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 65,
-            "column" : 10,
-            "source_fragment" : "vlan_meta"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [28, 9],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "FabricIngress.next.simple",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "FabricIngress.next.simple",
-            "nop" : "FabricIngress.next.simple"
-          },
-          "default_entry" : {
-            "action_id" : 9,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.next.simple",
-          "id" : 31,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 122,
-            "column" : 10,
-            "source_fragment" : "simple"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [29, 30, 31, 32, 33, 34, 6],
-          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_19",
-            "__MISS__" : "tbl_act_20"
-          },
-          "default_entry" : {
-            "action_id" : 6,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_19",
+          "name" : "tbl_act_18",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -13146,290 +12462,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_48",
-          "next_tables" : {
-            "act_19" : "node_48"
-          },
-          "default_entry" : {
-            "action_id" : 59,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 33,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [60],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_48",
-          "next_tables" : {
-            "act_20" : "node_48"
-          },
-          "default_entry" : {
-            "action_id" : 60,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 34,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 175,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "FabricIngress.next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [35, 36, 37, 7],
-          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_21",
-            "__MISS__" : "tbl_act_22"
-          }
-        },
-        {
-          "name" : "tbl_act_21",
-          "id" : 35,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_52",
-          "next_tables" : {
-            "act_21" : "node_52"
-          },
-          "default_entry" : {
-            "action_id" : 61,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_22",
-          "id" : 36,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_52",
-          "next_tables" : {
-            "act_22" : "node_52"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 37,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 207,
-            "column" : 10,
-            "source_fragment" : "multicast"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [38, 8],
-          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_23",
-            "__MISS__" : "tbl_act_24"
-          },
-          "default_entry" : {
-            "action_id" : 8,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_23",
-          "id" : 38,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_56",
-          "next_tables" : {
-            "act_23" : "node_56"
-          },
-          "default_entry" : {
-            "action_id" : 63,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_24",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_56",
-          "next_tables" : {
-            "act_24" : "node_56"
-          },
-          "default_entry" : {
-            "action_id" : 64,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_25",
-          "id" : 40,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_58",
-          "next_tables" : {
-            "act_25" : "node_58"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_26",
-          "id" : 41,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_62",
-          "next_tables" : {
-            "act_26" : "node_62"
-          },
-          "default_entry" : {
-            "action_id" : 66,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_27",
-          "id" : 42,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [67],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_64",
-          "next_tables" : {
-            "act_27" : "node_64"
-          },
-          "default_entry" : {
-            "action_id" : 67,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_28",
-          "id" : 43,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["act_28"],
+          "action_ids" : [52],
+          "actions" : ["act_18"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_28" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_18" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13437,7 +12477,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 44,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -13447,7 +12487,7 @@
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             }
@@ -13458,30 +12498,30 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 2],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
+          "action_ids" : [12, 2],
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricIngress.process_set_source_sink.int_set_source" : null,
-            "NoAction" : null
+            "nop" : null
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         }
       ],
       "action_profiles" : [
         {
-          "name" : "FabricIngress.next.ecmp_selector",
+          "name" : "FabricIngress.next.hashed_selector",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 145,
+            "line" : 161,
             "column" : 55,
-            "source_fragment" : "ecmp_selector"
+            "source_fragment" : "hashed_selector"
           },
           "max_size" : 64,
           "selector" : {
@@ -13501,11 +12541,11 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
               }
             ]
           }
@@ -13557,7 +12597,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+                    "value" : ["scalars", "spgw_normalizer_hasReturned"]
                   }
                 }
               }
@@ -13594,7 +12634,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -13610,14 +12650,67 @@
             }
           },
           "true_next" : "tbl_act_4",
-          "false_next" : "tbl_act_5"
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_13",
+          "name" : "node_12",
           "id" : 4,
           "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 102,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["vlan_tag", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_5",
+          "false_next" : "node_14"
+        },
+        {
+          "name" : "node_14",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_6",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+        },
+        {
+          "name" : "node_19",
+          "id" : 6,
+          "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 139,
+            "line" : 143,
             "column" : 12,
             "source_fragment" : "gtpu.isValid()"
           },
@@ -13636,11 +12729,11 @@
           "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
         },
         {
-          "name" : "node_17",
-          "id" : 5,
+          "name" : "node_23",
+          "id" : 7,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 143,
+            "line" : 147,
             "column" : 16,
             "source_fragment" : "!s1u_filter_table.apply().hit"
           },
@@ -13656,18 +12749,18 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_tmp_1"]
+                    "value" : ["scalars", "spgw_ingress_tmp"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_drop_now",
-          "false_next" : "tbl_act_8"
+          "true_next" : "tbl_act_10",
+          "false_next" : "tbl_act_11"
         },
         {
-          "name" : "node_24",
-          "id" : 6,
+          "name" : "node_30",
+          "id" : 8,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -13675,16 +12768,16 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "spgw_ingress_tmp_2"]
+                "value" : ["scalars", "spgw_ingress_tmp_0"]
               }
             }
           },
-          "true_next" : "tbl_act_11",
-          "false_next" : "tbl_act_12"
+          "true_next" : "tbl_act_14",
+          "false_next" : "tbl_act_15"
         },
         {
-          "name" : "node_27",
-          "id" : 7,
+          "name" : "node_33",
+          "id" : 9,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -13697,39 +12790,55 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+                    "value" : ["scalars", "spgw_ingress_hasReturned"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
-        },
-        {
-          "name" : "node_32",
-          "id" : 8,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "filtering_tmp_0"]
-              }
-            }
-          },
-          "true_next" : "FabricIngress.filtering.fwd_classifier",
-          "false_next" : "tbl_act_16"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_35"
         },
         {
           "name" : "node_35",
-          "id" : 9,
+          "id" : 10,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_36",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_36",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 191,
-            "column" : 11,
+            "line" : 131,
+            "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
           "expression" : {
@@ -13747,14 +12856,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_37"
+          "false_next" : "node_38"
         },
         {
-          "name" : "node_37",
-          "id" : 10,
+          "name" : "node_38",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 192,
+            "line" : 132,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -13777,10 +12886,10 @@
         },
         {
           "name" : "node_40",
-          "id" : 11,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 198,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -13799,181 +12908,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_43",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 70,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
           "name" : "node_48",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 219,
-            "column" : 12,
-            "source_fragment" : "!simple.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_4"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_58"
-        },
-        {
-          "name" : "node_52",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 220,
-            "column" : 16,
-            "source_fragment" : "!hashed.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_3"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_58"
-        },
-        {
-          "name" : "node_56",
-          "id" : 14,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 221,
-            "column" : 20,
-            "source_fragment" : "!multicast.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_2"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_58"
-        },
-        {
-          "name" : "node_58",
           "id" : 15,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_hasReturned_0"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_59",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_59",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
-            "column" : 12,
-            "source_fragment" : "!hdr.mpls.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["mpls", "$valid$"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_60",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_60",
-          "id" : 17,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 229,
-            "column" : 15,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_62",
-          "id" : 18,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -13991,15 +12966,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_64"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_64",
-          "id" : 19,
+          "name" : "node_50",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -14017,7 +12992,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
+          "true_next" : "tbl_act_18",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -14027,15 +13002,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_69",
+      "init_table" : "node_55",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 45,
+          "name" : "tbl_act_19",
+          "id" : 34,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14043,22 +13018,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_73",
+          "action_ids" : [97],
+          "actions" : ["act_19"],
+          "base_default_next" : "tbl_act_20",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_73"
+            "act_19" : "tbl_act_20"
           },
           "default_entry" : {
-            "action_id" : 111,
+            "action_id" : 97,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 46,
+          "name" : "tbl_act_20",
+          "id" : 35,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14066,45 +13041,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_29",
-          "next_tables" : {
-            "drop_now" : "tbl_act_29"
-          },
-          "default_entry" : {
-            "action_id" : 74,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_29",
-          "id" : 47,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [113],
-          "actions" : ["act_29"],
+          "action_ids" : [98],
+          "actions" : ["act_20"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_29" : null
+            "act_20" : null
           },
           "default_entry" : {
-            "action_id" : 113,
+            "action_id" : 98,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_1",
-          "id" : 48,
+          "name" : "tbl_act_21",
+          "id" : 36,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14112,14 +13064,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [99],
+          "actions" : ["act_21"],
+          "base_default_next" : "node_62",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_21" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 75,
+            "action_id" : 99,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 37,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [93],
+          "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 93,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 38,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [94],
+          "actions" : ["FabricEgress.egress_next.set_mpls"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14127,23 +13125,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 49,
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 258,
+            "line" : 285,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_port",
+              "name" : "eg_port",
               "target" : ["standard_metadata", "egress_port"],
               "mask" : null
             }
@@ -14154,23 +13152,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112, 73],
+          "action_ids" : [96, 55],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_79",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_79",
-            "nop" : "node_79"
+            "__HIT__" : "tbl_act_22",
+            "__MISS__" : "tbl_act_23"
           },
           "default_entry" : {
-            "action_id" : 73,
-            "action_const" : false,
+            "action_id" : 55,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 50,
+          "name" : "tbl_act_22",
+          "id" : 40,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14178,14 +13176,175 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_81",
+          "action_ids" : [100],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_81"
+            "act_22" : "node_69"
           },
           "default_entry" : {
-            "action_id" : 76,
+            "action_id" : 100,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_23",
+          "id" : 41,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [101],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_69",
+          "next_tables" : {
+            "act_23" : "node_69"
+          },
+          "default_entry" : {
+            "action_id" : 101,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 42,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [95],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_72",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_72"
+          },
+          "default_entry" : {
+            "action_id" : 95,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_24",
+          "id" : 43,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [103],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_74",
+          "next_tables" : {
+            "act_25" : "node_74"
+          },
+          "default_entry" : {
+            "action_id" : 103,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_25",
+          "id" : 44,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [102],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_80",
+          "next_tables" : {
+            "act_24" : "node_80"
+          },
+          "default_entry" : {
+            "action_id" : 102,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_26",
+          "id" : 45,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [105],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_78",
+          "next_tables" : {
+            "act_27" : "node_78"
+          },
+          "default_entry" : {
+            "action_id" : 105,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_27",
+          "id" : 46,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [104],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_80",
+          "next_tables" : {
+            "act_26" : "node_80"
+          },
+          "default_entry" : {
+            "action_id" : 104,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_egress_gtpu_encap",
+          "id" : 47,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [58],
+          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
+          "base_default_next" : "node_82",
+          "next_tables" : {
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_82"
+          },
+          "default_entry" : {
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14193,36 +13352,36 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 51,
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 65,
+            "line" : 66,
             "column" : 10,
             "source_fragment" : "tb_int_source"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             }
           ],
@@ -14232,23 +13391,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77, 69],
-          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_84",
+          "action_ids" : [59, 53],
+          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
+          "base_default_next" : "node_85",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_84",
-            "NoAction" : "node_84"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_85",
+            "nop" : "node_85"
           },
           "default_entry" : {
-            "action_id" : 69,
-            "action_const" : false,
+            "action_id" : 53,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 52,
+          "name" : "tbl_act_28",
+          "id" : 49,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14256,14 +13415,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [114],
-          "actions" : ["act_30"],
+          "action_ids" : [106],
+          "actions" : ["act_28"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_30" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_28" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 114,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14271,17 +13430,17 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 53,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 271,
+            "line" : 315,
             "column" : 10,
             "source_fragment" : "tb_int_insert"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.int_header.is_valid",
+              "name" : "int_is_valid",
               "target" : ["int_header", "$valid$"],
               "mask" : null
             }
@@ -14292,23 +13451,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [78, 72],
+          "action_ids" : [60, 54],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_87",
+          "base_default_next" : "node_88",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_87",
-            "nop" : "node_87"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_88",
+            "nop" : "node_88"
           },
           "default_entry" : {
-            "action_id" : 72,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 54,
+          "name" : "tbl_act_29",
+          "id" : 51,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14316,14 +13475,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [115],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_89",
+          "action_ids" : [107],
+          "actions" : ["act_29"],
+          "base_default_next" : "node_90",
           "next_tables" : {
-            "act_31" : "node_89"
+            "act_29" : "node_90"
           },
           "default_entry" : {
-            "action_id" : 115,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14331,10 +13490,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 55,
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 286,
+            "line" : 331,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0003"
           },
@@ -14352,7 +13511,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 70],
+          "action_ids" : [61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 56],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -14375,7 +13534,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 70,
+            "action_id" : 56,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -14384,7 +13543,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 310,
+                "line" : 354,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0003_i0()"
               },
@@ -14395,7 +13554,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 61,
                 "action_data" : []
               },
               "priority" : 1
@@ -14403,7 +13562,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 311,
+                "line" : 355,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0003_i1()"
               },
@@ -14414,7 +13573,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 2
@@ -14422,7 +13581,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 312,
+                "line" : 356,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0003_i2()"
               },
@@ -14433,7 +13592,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 3
@@ -14441,7 +13600,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 313,
+                "line" : 357,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0003_i3()"
               },
@@ -14452,7 +13611,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 4
@@ -14460,7 +13619,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 314,
+                "line" : 358,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0003_i4()"
               },
@@ -14471,7 +13630,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 5
@@ -14479,7 +13638,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 315,
+                "line" : 359,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0003_i5()"
               },
@@ -14490,7 +13649,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 6
@@ -14498,7 +13657,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 316,
+                "line" : 360,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0003_i6()"
               },
@@ -14509,7 +13668,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 7
@@ -14517,7 +13676,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 317,
+                "line" : 361,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0003_i7()"
               },
@@ -14528,7 +13687,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 8
@@ -14536,7 +13695,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 318,
+                "line" : 362,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0003_i8()"
               },
@@ -14547,7 +13706,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 9
@@ -14555,7 +13714,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 319,
+                "line" : 363,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0003_i9()"
               },
@@ -14566,7 +13725,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 10
@@ -14574,7 +13733,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 320,
+                "line" : 364,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0003_i10()"
               },
@@ -14585,7 +13744,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 11
@@ -14593,7 +13752,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 321,
+                "line" : 365,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0003_i11()"
               },
@@ -14604,7 +13763,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 12
@@ -14612,7 +13771,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 322,
+                "line" : 366,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0003_i12()"
               },
@@ -14623,7 +13782,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 13
@@ -14631,7 +13790,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 323,
+                "line" : 367,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0003_i13()"
               },
@@ -14642,7 +13801,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 14
@@ -14650,7 +13809,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 324,
+                "line" : 368,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0003_i14()"
               },
@@ -14661,7 +13820,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 93,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 15
@@ -14669,7 +13828,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 325,
+                "line" : 369,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0003_i15()"
               },
@@ -14680,7 +13839,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 94,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 16
@@ -14689,10 +13848,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 56,
+          "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 330,
+            "line" : 375,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0407"
           },
@@ -14710,30 +13869,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 71],
+          "action_ids" : [77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 57],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_32",
+          "base_default_next" : "tbl_act_30",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_32",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_32",
-            "NoAction" : "tbl_act_32"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_30",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_30",
+            "NoAction" : "tbl_act_30"
           },
           "default_entry" : {
-            "action_id" : 71,
+            "action_id" : 57,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -14742,7 +13901,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 354,
+                "line" : 398,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0407_i0()"
               },
@@ -14753,7 +13912,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 95,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 1
@@ -14761,7 +13920,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 355,
+                "line" : 399,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0407_i1()"
               },
@@ -14772,7 +13931,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 2
@@ -14780,7 +13939,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 356,
+                "line" : 400,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0407_i2()"
               },
@@ -14791,7 +13950,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 3
@@ -14799,7 +13958,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 357,
+                "line" : 401,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0407_i3()"
               },
@@ -14810,7 +13969,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 4
@@ -14818,7 +13977,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 358,
+                "line" : 402,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0407_i4()"
               },
@@ -14829,7 +13988,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 5
@@ -14837,7 +13996,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 359,
+                "line" : 403,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0407_i5()"
               },
@@ -14848,7 +14007,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 6
@@ -14856,7 +14015,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 360,
+                "line" : 404,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0407_i6()"
               },
@@ -14867,7 +14026,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 7
@@ -14875,7 +14034,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 361,
+                "line" : 405,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0407_i7()"
               },
@@ -14886,7 +14045,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 8
@@ -14894,7 +14053,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 362,
+                "line" : 406,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0407_i8()"
               },
@@ -14905,7 +14064,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 103,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 9
@@ -14913,7 +14072,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 363,
+                "line" : 407,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0407_i9()"
               },
@@ -14924,7 +14083,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 104,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 10
@@ -14932,7 +14091,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 364,
+                "line" : 408,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0407_i10()"
               },
@@ -14943,7 +14102,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 105,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 11
@@ -14951,7 +14110,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 365,
+                "line" : 409,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0407_i11()"
               },
@@ -14962,7 +14121,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 106,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 12
@@ -14970,7 +14129,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 366,
+                "line" : 410,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0407_i12()"
               },
@@ -14981,7 +14140,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 107,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 13
@@ -14989,7 +14148,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 367,
+                "line" : 411,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0407_i13()"
               },
@@ -15000,7 +14159,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 108,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 14
@@ -15008,7 +14167,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 368,
+                "line" : 412,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0407_i14()"
               },
@@ -15019,7 +14178,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 109,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 15
@@ -15027,7 +14186,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 369,
+                "line" : 413,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0407_i15()"
               },
@@ -15038,7 +14197,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 110,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 16
@@ -15046,7 +14205,76 @@
           ]
         },
         {
+          "name" : "tbl_act_30",
+          "id" : 54,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [109],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_94",
+          "next_tables" : {
+            "act_31" : "node_94"
+          },
+          "default_entry" : {
+            "action_id" : 109,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_31",
+          "id" : 55,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [108],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_96",
+          "next_tables" : {
+            "act_30" : "node_96"
+          },
+          "default_entry" : {
+            "action_id" : 108,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_32",
+          "id" : 56,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [110],
+          "actions" : ["act_32"],
+          "base_default_next" : "node_98",
+          "next_tables" : {
+            "act_32" : "node_98"
+          },
+          "default_entry" : {
+            "action_id" : 110,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_33",
           "id" : 57,
           "key" : [],
           "match_type" : "exact",
@@ -15055,83 +14283,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [117],
+          "action_ids" : [111],
           "actions" : ["act_33"],
-          "base_default_next" : "node_93",
-          "next_tables" : {
-            "act_33" : "node_93"
-          },
-          "default_entry" : {
-            "action_id" : 117,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_33",
-          "id" : 58,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [116],
-          "actions" : ["act_32"],
-          "base_default_next" : "node_95",
-          "next_tables" : {
-            "act_32" : "node_95"
-          },
-          "default_entry" : {
-            "action_id" : 116,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_34",
-          "id" : 59,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [118],
-          "actions" : ["act_34"],
-          "base_default_next" : "node_97",
-          "next_tables" : {
-            "act_34" : "node_97"
-          },
-          "default_entry" : {
-            "action_id" : 118,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_35",
-          "id" : 60,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [119],
-          "actions" : ["act_35"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_35" : null
+            "act_33" : null
           },
           "default_entry" : {
-            "action_id" : 119,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15141,11 +14300,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_69",
-          "id" : 20,
+          "name" : "node_55",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -15171,14 +14330,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_70"
+          "false_next" : "node_56"
         },
         {
-          "name" : "node_70",
-          "id" : 21,
+          "name" : "node_56",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -15196,65 +14355,15 @@
               }
             }
           },
-          "true_next" : "node_71",
-          "false_next" : "node_76"
+          "true_next" : "node_57",
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_71",
-          "id" : 22,
+          "name" : "node_57",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["vlan_tag", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_73"
-        },
-        {
-          "name" : "node_73",
-          "id" : 23,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -15306,15 +14415,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
-          "false_next" : "tbl_act_29"
+          "true_next" : "tbl_act_19",
+          "false_next" : "tbl_act_20"
         },
         {
-          "name" : "node_76",
-          "id" : 24,
+          "name" : "node_60",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -15359,17 +14468,220 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_1",
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_62"
+        },
+        {
+          "name" : "node_62",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 304,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_63",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_63",
+          "id" : 22,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 305,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_79",
+          "name" : "node_69",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_70",
+          "false_next" : "node_72"
+        },
+        {
+          "name" : "node_70",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_72"
+        },
+        {
+          "name" : "node_72",
           "id" : 25,
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 221,
+            "filename" : "include/control/next.p4",
+            "line" : 318,
             "column" : 12,
-            "source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK"
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_76"
+        },
+        {
+          "name" : "node_74",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_25",
+          "false_next" : "node_80"
+        },
+        {
+          "name" : "node_76",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 322,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_26",
+          "false_next" : "node_80"
+        },
+        {
+          "name" : "node_78",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_80"
+        },
+        {
+          "name" : "node_80",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 226,
+            "column" : 12,
+            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
           },
           "expression" : {
             "type" : "expression",
@@ -15386,14 +14698,14 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_81"
+          "false_next" : "node_82"
         },
         {
-          "name" : "node_81",
-          "id" : 26,
+          "name" : "node_82",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 98,
+            "line" : 102,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port != 255 && ..."
           },
@@ -15466,14 +14778,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_82"
+          "true_next" : "node_83"
         },
         {
-          "name" : "node_82",
-          "id" : 27,
+          "name" : "node_83",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 102,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "fabric_metadata.int_meta.source == true"
           },
@@ -15499,14 +14811,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_84"
+          "false_next" : "node_85"
         },
         {
-          "name" : "node_84",
-          "id" : 28,
+          "name" : "node_85",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 106,
+            "line" : 110,
             "column" : 15,
             "source_fragment" : "hdr.int_header.isValid()"
           },
@@ -15522,14 +14834,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_30"
+          "true_next" : "tbl_act_28"
         },
         {
-          "name" : "node_87",
-          "id" : 29,
+          "name" : "node_88",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 375,
+            "line" : 419,
             "column" : 12,
             "source_fragment" : "fmeta.int_meta.transit == false"
           },
@@ -15554,12 +14866,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_31",
-          "false_next" : "node_89"
+          "true_next" : "tbl_act_29",
+          "false_next" : "node_90"
         },
         {
-          "name" : "node_89",
-          "id" : 30,
+          "name" : "node_90",
+          "id" : 34,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15572,7 +14884,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
                   }
                 }
               }
@@ -15582,11 +14894,11 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_93",
-          "id" : 31,
+          "name" : "node_94",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 383,
+            "line" : 427,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -15601,15 +14913,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_95"
+          "true_next" : "tbl_act_31",
+          "false_next" : "node_96"
         },
         {
-          "name" : "node_95",
-          "id" : 32,
+          "name" : "node_96",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 386,
+            "line" : 430,
             "column" : 12,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -15624,15 +14936,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_34",
-          "false_next" : "node_97"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_98"
         },
         {
-          "name" : "node_97",
-          "id" : 33,
+          "name" : "node_98",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 389,
+            "line" : 433,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.isValid()"
           },
@@ -15648,7 +14960,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_35"
+          "true_next" : "tbl_act_33"
         }
       ]
     }
@@ -15683,7 +14995,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index be3e607..cd3d23d 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -6,7 +6,7 @@
   }
   match_fields {
     id: 1
-    name: "ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: EXACT
   }
@@ -14,12 +14,12 @@
     id: 16804065
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318781522
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -29,15 +29,15 @@
   }
   match_fields {
     id: 1
-    name: "gtpu_ipv4.dst_addr"
+    name: "gtp_ipv4_dst"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800567
+    id: 16819938
   }
+  const_default_action_id: 16819938
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -47,7 +47,7 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -55,12 +55,12 @@
     id: 16778827
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318787614
   size: 511
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -70,38 +70,34 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.vlan_tag.is_valid"
+    name: "vlan_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   action_refs {
-    id: 16835546
+    id: 16836487
   }
   action_refs {
-    id: 16793253
+    id: 16818236
   }
   action_refs {
-    id: 16798734
+    id: 16794911
   }
-  action_refs {
-    id: 16833700
-  }
-  const_default_action_id: 16835546
+  const_default_action_id: 16836487
   direct_resource_ids: 318815501
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -111,19 +107,19 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: EXACT
   }
@@ -133,7 +129,6 @@
   const_default_action_id: 16840921
   direct_resource_ids: 318827326
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -143,13 +138,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
@@ -157,12 +152,12 @@
     id: 16811012
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318770289
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -172,7 +167,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.mpls.label"
+    name: "mpls_label"
     bitwidth: 20
     match_type: EXACT
   }
@@ -180,12 +175,12 @@
     id: 16827758
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318830507
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -195,7 +190,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: LPM
   }
@@ -206,120 +201,119 @@
     id: 16804187
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318811107
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33574876
-    name: "FabricIngress.forwarding.acl"
+    id: 33618978
+    name: "FabricIngress.acl.acl"
     alias: "acl"
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "fabric_metadata.ip_proto"
+    name: "ip_proto"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 5
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_src"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 6
-    name: "hdr.ethernet.src_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 7
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   match_fields {
     id: 8
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 9
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 10
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 11
-    name: "hdr.icmp.icmp_type"
+    name: "icmp_type"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 12
-    name: "hdr.icmp.icmp_code"
+    name: "icmp_code"
     bitwidth: 8
     match_type: TERNARY
   }
   action_refs {
-    id: 16785374
+    id: 16807382
   }
   action_refs {
-    id: 16801806
+    id: 16829684
   }
   action_refs {
-    id: 16784835
+    id: 16790975
   }
   action_refs {
-    id: 16833260
+    id: 16820765
   }
   action_refs {
-    id: 16842570
+    id: 16827694
   }
-  const_default_action_id: 16842570
-  direct_resource_ids: 318772272
+  const_default_action_id: 16827694
+  direct_resource_ids: 318801025
   size: 128
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33562709
-    name: "FabricIngress.next.vlan_meta"
-    alias: "vlan_meta"
+    id: 33599709
+    name: "FabricIngress.next.next_vlan"
+    alias: "next_vlan"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
@@ -330,47 +324,41 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318785328
+  const_default_action_id: 16819938
+  direct_resource_ids: 318768144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33571723
-    name: "FabricIngress.next.simple"
-    alias: "simple"
+    id: 33596977
+    name: "FabricIngress.next.xconnect"
+    alias: "xconnect"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16802668
+    id: 16842190
   }
   action_refs {
-    id: 16808391
+    id: 16837052
   }
   action_refs {
-    id: 16780007
-  }
-  action_refs {
-    id: 16806134
-  }
-  action_refs {
-    id: 16795970
-  }
-  action_refs {
-    id: 16791579
-  }
-  action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318769096
+  const_default_action_id: 16819938
+  direct_resource_ids: 318778156
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -380,27 +368,27 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800211
+    id: 16815357
   }
   action_refs {
-    id: 16779239
+    id: 16791402
   }
   action_refs {
-    id: 16819349
+    id: 16779255
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  implementation_id: 285233747
+  const_default_action_id: 16819938
+  implementation_id: 285217164
   direct_resource_ids: 318800532
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -410,20 +398,20 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16789575
+    id: 16779917
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318801752
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -433,25 +421,25 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
@@ -459,12 +447,12 @@
     id: 16785857
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318800047
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -474,7 +462,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.int_header.is_valid"
+    name: "int_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
@@ -487,143 +475,6 @@
   }
   const_default_action_id: 16819938
   size: 1
-  idle_timeout_behavior: NO_TIMEOUT
-}
-tables {
-  preamble {
-    id: 33569467
-    name: "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
-    alias: "tb_int_inst_0003"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0003"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16809886
-  }
-  action_refs {
-    id: 16783130
-  }
-  action_refs {
-    id: 16809096
-  }
-  action_refs {
-    id: 16834117
-  }
-  action_refs {
-    id: 16825314
-  }
-  action_refs {
-    id: 16811436
-  }
-  action_refs {
-    id: 16802199
-  }
-  action_refs {
-    id: 16796779
-  }
-  action_refs {
-    id: 16787676
-  }
-  action_refs {
-    id: 16825351
-  }
-  action_refs {
-    id: 16793999
-  }
-  action_refs {
-    id: 16786714
-  }
-  action_refs {
-    id: 16814203
-  }
-  action_refs {
-    id: 16807054
-  }
-  action_refs {
-    id: 16800064
-  }
-  action_refs {
-    id: 16792997
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 16
-  idle_timeout_behavior: NO_TIMEOUT
-  is_const_table: true
-}
-tables {
-  preamble {
-    id: 33595914
-    name: "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
-    alias: "tb_int_inst_0407"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.int_header.instruction_mask_0407"
-    bitwidth: 4
-    match_type: EXACT
-  }
-  action_refs {
-    id: 16819022
-  }
-  action_refs {
-    id: 16804144
-  }
-  action_refs {
-    id: 16829117
-  }
-  action_refs {
-    id: 16797781
-  }
-  action_refs {
-    id: 16813543
-  }
-  action_refs {
-    id: 16824974
-  }
-  action_refs {
-    id: 16815362
-  }
-  action_refs {
-    id: 16835399
-  }
-  action_refs {
-    id: 16834505
-  }
-  action_refs {
-    id: 16811493
-  }
-  action_refs {
-    id: 16825476
-  }
-  action_refs {
-    id: 16799777
-  }
-  action_refs {
-    id: 16829592
-  }
-  action_refs {
-    id: 16805877
-  }
-  action_refs {
-    id: 16780182
-  }
-  action_refs {
-    id: 16799476
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  size: 16
-  idle_timeout_behavior: NO_TIMEOUT
-  is_const_table: true
 }
 tables {
   preamble {
@@ -633,13 +484,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "standard_metadata.egress_port"
+    name: "eg_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -650,16 +501,9 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318827144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
-  }
 }
 actions {
   preamble {
@@ -670,20 +514,6 @@
 }
 actions {
   preamble {
-    id: 16823970
-    name: "drop_now"
-    alias: "drop_now"
-  }
-}
-actions {
-  preamble {
-    id: 16819909
-    name: "FabricIngress.spgw_ingress.gtpu_decap"
-    alias: "gtpu_decap"
-  }
-}
-actions {
-  preamble {
     id: 16804065
     name: "FabricIngress.spgw_ingress.set_dl_sess_info"
     alias: "set_dl_sess_info"
@@ -713,44 +543,32 @@
 }
 actions {
   preamble {
-    id: 16798734
-    name: "FabricIngress.filtering.drop"
-    alias: "filtering.drop"
+    id: 16836487
+    name: "FabricIngress.filtering.deny"
+    alias: "deny"
   }
 }
 actions {
   preamble {
-    id: 16793253
-    name: "FabricIngress.filtering.set_vlan"
-    alias: "filtering.set_vlan"
+    id: 16818236
+    name: "FabricIngress.filtering.permit"
+    alias: "permit"
+  }
+}
+actions {
+  preamble {
+    id: 16794911
+    name: "FabricIngress.filtering.permit_with_internal_vlan"
+    alias: "permit_with_internal_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16835546
-    name: "FabricIngress.filtering.push_internal_vlan"
-    alias: "push_internal_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16833700
-    name: "FabricIngress.filtering.nop_ingress_port_vlan"
-    alias: "nop_ingress_port_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16840921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
@@ -806,8 +624,8 @@
 }
 actions {
   preamble {
-    id: 16785374
-    name: "FabricIngress.forwarding.set_next_id_acl"
+    id: 16807382
+    name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
   }
   params {
@@ -818,29 +636,29 @@
 }
 actions {
   preamble {
-    id: 16801806
-    name: "FabricIngress.forwarding.punt_to_cpu"
+    id: 16829684
+    name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16784835
-    name: "FabricIngress.forwarding.clone_to_cpu"
+    id: 16790975
+    name: "FabricIngress.acl.clone_to_cpu"
     alias: "clone_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16833260
-    name: "FabricIngress.forwarding.drop"
-    alias: "forwarding.drop"
+    id: 16820765
+    name: "FabricIngress.acl.drop"
+    alias: "drop"
   }
 }
 actions {
   preamble {
-    id: 16842570
-    name: "FabricIngress.forwarding.nop_acl"
+    id: 16827694
+    name: "FabricIngress.acl.nop_acl"
     alias: "nop_acl"
   }
 }
@@ -848,19 +666,19 @@
   preamble {
     id: 16790685
     name: "FabricIngress.next.set_vlan"
-    alias: "next.set_vlan"
+    alias: "set_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16802668
-    name: "FabricIngress.next.output_simple"
-    alias: "output_simple"
+    id: 16842190
+    name: "FabricIngress.next.output_xconnect"
+    alias: "output_xconnect"
   }
   params {
     id: 1
@@ -870,26 +688,33 @@
 }
 actions {
   preamble {
-    id: 16808391
-    name: "FabricIngress.next.set_vlan_output"
-    alias: "set_vlan_output"
+    id: 16837052
+    name: "FabricIngress.next.set_next_id_xconnect"
+    alias: "set_next_id_xconnect"
   }
   params {
     id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16815357
+    name: "FabricIngress.next.output_hashed"
+    alias: "output_hashed"
   }
   params {
-    id: 2
+    id: 1
     name: "port_num"
     bitwidth: 9
   }
 }
 actions {
   preamble {
-    id: 16780007
-    name: "FabricIngress.next.l3_routing_simple"
-    alias: "l3_routing_simple"
+    id: 16791402
+    name: "FabricIngress.next.routing_hashed"
+    alias: "routing_hashed"
   }
   params {
     id: 1
@@ -909,9 +734,9 @@
 }
 actions {
   preamble {
-    id: 16806134
-    name: "FabricIngress.next.mpls_routing_v4_simple"
-    alias: "mpls_routing_v4_simple"
+    id: 16779255
+    name: "FabricIngress.next.mpls_routing_hashed"
+    alias: "mpls_routing_hashed"
   }
   params {
     id: 1
@@ -936,151 +761,21 @@
 }
 actions {
   preamble {
-    id: 16795970
-    name: "FabricIngress.next.mpls_routing_v6_simple"
-    alias: "mpls_routing_v6_simple"
+    id: 16779917
+    name: "FabricIngress.next.set_mcast_group_id"
+    alias: "set_mcast_group_id"
   }
   params {
     id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16791579
-    name: "FabricIngress.next.l3_routing_vlan"
-    alias: "l3_routing_vlan"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16800211
-    name: "FabricIngress.next.l3_routing_hashed"
-    alias: "l3_routing_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-}
-actions {
-  preamble {
-    id: 16779239
-    name: "FabricIngress.next.mpls_routing_v4_hashed"
-    alias: "mpls_routing_v4_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16819349
-    name: "FabricIngress.next.mpls_routing_v6_hashed"
-    alias: "mpls_routing_v6_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16789575
-    name: "FabricIngress.next.set_mcast_group"
-    alias: "set_mcast_group"
-  }
-  params {
-    id: 1
-    name: "gid"
+    name: "group_id"
     bitwidth: 16
   }
 }
 actions {
   preamble {
-    id: 16829135
-    name: "FabricEgress.spgw_egress.gtpu_encap"
-    alias: "gtpu_encap"
+    id: 16800567
+    name: "NoAction"
+    alias: "NoAction"
   }
 }
 actions {
@@ -1124,247 +819,16 @@
 }
 actions {
   preamble {
-    id: 16809886
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0"
-    alias: "int_set_header_0003_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16783130
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1"
-    alias: "int_set_header_0003_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16809096
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2"
-    alias: "int_set_header_0003_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16834117
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3"
-    alias: "int_set_header_0003_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16825314
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4"
-    alias: "int_set_header_0003_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16811436
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5"
-    alias: "int_set_header_0003_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16802199
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6"
-    alias: "int_set_header_0003_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16796779
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7"
-    alias: "int_set_header_0003_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16787676
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8"
-    alias: "int_set_header_0003_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16825351
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9"
-    alias: "int_set_header_0003_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16793999
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10"
-    alias: "int_set_header_0003_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16786714
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11"
-    alias: "int_set_header_0003_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16814203
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12"
-    alias: "int_set_header_0003_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16807054
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13"
-    alias: "int_set_header_0003_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16800064
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14"
-    alias: "int_set_header_0003_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16792997
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15"
-    alias: "int_set_header_0003_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16819022
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0"
-    alias: "int_set_header_0407_i0"
-  }
-}
-actions {
-  preamble {
-    id: 16804144
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1"
-    alias: "int_set_header_0407_i1"
-  }
-}
-actions {
-  preamble {
-    id: 16829117
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2"
-    alias: "int_set_header_0407_i2"
-  }
-}
-actions {
-  preamble {
-    id: 16797781
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3"
-    alias: "int_set_header_0407_i3"
-  }
-}
-actions {
-  preamble {
-    id: 16813543
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4"
-    alias: "int_set_header_0407_i4"
-  }
-}
-actions {
-  preamble {
-    id: 16824974
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5"
-    alias: "int_set_header_0407_i5"
-  }
-}
-actions {
-  preamble {
-    id: 16815362
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6"
-    alias: "int_set_header_0407_i6"
-  }
-}
-actions {
-  preamble {
-    id: 16835399
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7"
-    alias: "int_set_header_0407_i7"
-  }
-}
-actions {
-  preamble {
-    id: 16834505
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8"
-    alias: "int_set_header_0407_i8"
-  }
-}
-actions {
-  preamble {
-    id: 16811493
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9"
-    alias: "int_set_header_0407_i9"
-  }
-}
-actions {
-  preamble {
-    id: 16825476
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10"
-    alias: "int_set_header_0407_i10"
-  }
-}
-actions {
-  preamble {
-    id: 16799777
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11"
-    alias: "int_set_header_0407_i11"
-  }
-}
-actions {
-  preamble {
-    id: 16829592
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12"
-    alias: "int_set_header_0407_i12"
-  }
-}
-actions {
-  preamble {
-    id: 16805877
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13"
-    alias: "int_set_header_0407_i13"
-  }
-}
-actions {
-  preamble {
-    id: 16780182
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14"
-    alias: "int_set_header_0407_i14"
-  }
-}
-actions {
-  preamble {
-    id: 16799476
-    name: "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15"
-    alias: "int_set_header_0407_i15"
-  }
-}
-actions {
-  preamble {
-    id: 16801047
-    name: "FabricEgress.pkt_io_egress.pop_vlan"
-    alias: "pkt_io_egress.pop_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16790030
     name: "FabricEgress.egress_next.pop_vlan"
-    alias: "egress_next.pop_vlan"
+    alias: "pop_vlan"
   }
 }
 action_profiles {
   preamble {
-    id: 285233747
-    name: "FabricIngress.next.ecmp_selector"
-    alias: "ecmp_selector"
+    id: 285217164
+    name: "FabricIngress.next.hashed_selector"
+    alias: "hashed_selector"
   }
   table_ids: 33608588
   with_selector: true
@@ -1471,36 +935,36 @@
 }
 direct_counters {
   preamble {
-    id: 318772272
-    name: "FabricIngress.forwarding.acl_counter"
+    id: 318801025
+    name: "FabricIngress.acl.acl_counter"
     alias: "acl_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33574876
+  direct_table_id: 33618978
 }
 direct_counters {
   preamble {
-    id: 318785328
-    name: "FabricIngress.next.vlan_meta_counter"
-    alias: "vlan_meta_counter"
+    id: 318768144
+    name: "FabricIngress.next.next_vlan_counter"
+    alias: "next_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33562709
+  direct_table_id: 33599709
 }
 direct_counters {
   preamble {
-    id: 318769096
-    name: "FabricIngress.next.simple_counter"
-    alias: "simple_counter"
+    id: 318778156
+    name: "FabricIngress.next.xconnect_counter"
+    alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33571723
+  direct_table_id: 33596977
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index a3db0a8..795c067 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -4,29 +4,33 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp", 4, false],
-        ["tmp_0", 8, false],
+        ["tmp_0", 4, false],
+        ["tmp", 8, false],
         ["tmp_1", 32, false],
         ["tmp_2", 32, false],
-        ["spgw_ingress_tmp_1", 1, false],
-        ["spgw_ingress_tmp_2", 1, false],
-        ["filtering_tmp_0", 1, false],
-        ["next_tmp_2", 1, false],
-        ["next_tmp_3", 1, false],
-        ["next_tmp_4", 1, false],
-        ["spgw_normalizer_hasReturned_0", 1, false],
-        ["spgw_ingress_hasReturned_0", 1, false],
-        ["next_hasReturned_0", 1, false],
+        ["spgw_ingress_tmp", 1, false],
+        ["spgw_ingress_tmp_0", 1, false],
+        ["spgw_normalizer_hasReturned", 1, false],
+        ["spgw_ingress_hasReturned", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["fabric_metadata_t.eth_type", 16, false],
+        ["fabric_metadata_t.ip_eth_type", 16, false],
+        ["fabric_metadata_t.vlan_id", 12, false],
+        ["fabric_metadata_t.vlan_pri", 3, false],
+        ["fabric_metadata_t.vlan_cfi", 1, false],
+        ["fabric_metadata_t.mpls_label", 20, false],
+        ["fabric_metadata_t.mpls_ttl", 8, false],
+        ["fabric_metadata_t.skip_forwarding", 1, false],
+        ["fabric_metadata_t.skip_next", 1, false],
         ["fabric_metadata_t.fwd_type", 3, false],
         ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.pop_vlan_when_packet_in", 1, false],
         ["fabric_metadata_t.is_multicast", 1, false],
         ["fabric_metadata_t.is_controller_packet_out", 1, false],
         ["fabric_metadata_t.clone_to_cpu", 1, false],
         ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_src_port", 16, false],
-        ["fabric_metadata_t.l4_dst_port", 16, false],
-        ["_padding_1", 4, false]
+        ["fabric_metadata_t.l4_sport", 16, false],
+        ["fabric_metadata_t.l4_dport", 16, false],
+        ["_padding_1", 3, false]
       ]
     },
     {
@@ -63,7 +67,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -73,7 +77,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -109,8 +113,8 @@
       "name" : "udp_t",
       "id" : 6,
       "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["len", 16, false],
         ["checksum", 16, false]
       ]
@@ -131,22 +135,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 8,
       "fields" : [
-        ["hw_type", 16, false],
-        ["proto_type", 16, false],
-        ["hw_addr_len", 8, false],
-        ["proto_addr_len", 8, false],
-        ["opcode", 16, false]
-      ]
-    },
-    {
-      "name" : "tcp_t",
-      "id" : 9,
-      "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["seq_no", 32, false],
         ["ack_no", 32, false],
         ["data_offset", 4, false],
@@ -160,7 +153,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 10,
+      "id" : 9,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -172,7 +165,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -180,7 +173,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -188,7 +181,7 @@
     },
     {
       "name" : "spgw_meta_t",
-      "id" : 13,
+      "id" : 12,
       "fields" : [
         ["direction", 2, false],
         ["ipv4_len", 16, false],
@@ -229,58 +222,58 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "inner_vlan_tag",
       "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 5,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 5,
+      "id" : 6,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_ipv4",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 10,
-      "header_type" : "ipv4_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 11,
-      "header_type" : "arp_t",
+      "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -406,6 +399,32 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -423,12 +442,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -442,7 +455,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -463,12 +476,52 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -488,13 +541,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["inner_vlan_tag", "eth_type"]
             }
           ]
         },
         {
           "name" : "parse_mpls",
-          "id" : 4,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -509,7 +562,33 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -535,13 +614,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -564,6 +643,19 @@
                 }
               ],
               "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -599,29 +691,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 6,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 7,
           "parser_ops" : [
@@ -638,11 +707,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "src_port"]
+                  "value" : ["tcp", "sport"]
                 }
               ],
               "op" : "set"
@@ -651,11 +720,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "dst_port"]
+                  "value" : ["tcp", "dport"]
                 }
               ],
               "op" : "set"
@@ -687,11 +756,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "src_port"]
+                  "value" : ["udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -700,11 +769,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "dst_port"]
+                  "value" : ["udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -726,7 +795,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -761,7 +830,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp_0"]
+                  "value" : ["scalars", "tmp"]
                 },
                 {
                   "type" : "expression",
@@ -820,7 +889,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             }
           ]
         },
@@ -896,11 +965,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "src_port"]
+                  "value" : ["inner_udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -909,11 +978,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["inner_udp", "dst_port"]
+                  "value" : ["inner_udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -938,11 +1007,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "tcp", "udp", "icmp"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "tcp", "udp", "icmp"]
     }
   ],
   "meter_arrays" : [],
@@ -966,7 +1035,7 @@
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 34,
+        "line" : 31,
         "column" : 50,
         "source_fragment" : "ingress_port_vlan_counter"
       }
@@ -978,7 +1047,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -990,7 +1059,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -1002,7 +1071,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1014,45 +1083,45 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 80,
+        "line" : 82,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
     },
     {
-      "name" : "FabricIngress.forwarding.acl_counter",
+      "name" : "FabricIngress.acl.acl_counter",
       "id" : 6,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
+      "binding" : "FabricIngress.acl.acl",
       "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
         "column" : 50,
         "source_fragment" : "acl_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.vlan_meta",
+      "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 58,
+        "line" : 67,
         "column" : 50,
-        "source_fragment" : "vlan_meta_counter"
+        "source_fragment" : "next_vlan_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.simple_counter",
+      "name" : "FabricIngress.next.xconnect_counter",
       "id" : 8,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.simple",
+      "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 91,
         "column" : 50,
-        "source_fragment" : "simple_counter"
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
@@ -1062,7 +1131,7 @@
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
@@ -1074,7 +1143,7 @@
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
@@ -1084,7 +1153,7 @@
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -1096,7 +1165,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -1110,7 +1179,7 @@
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -1184,7 +1253,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1305,49 +1374,49 @@
   "learn_lists" : [],
   "actions" : [
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 0,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 1,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 2,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 3,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 4,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 5,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 6,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 7,
       "runtime_data" : [],
       "primitives" : []
@@ -1359,35 +1428,8 @@
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 9,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricIngress.spgw_ingress.gtpu_decap",
-      "id" : 10,
+      "id" : 9,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1400,7 +1442,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 54,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
           }
@@ -1415,7 +1457,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
           }
@@ -1430,7 +1472,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
           }
@@ -1439,7 +1481,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
-      "id" : 11,
+      "id" : 10,
       "runtime_data" : [
         {
           "name" : "teid",
@@ -1469,9 +1511,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 62,
+            "line" : 63,
             "column" : 8,
-            "source_fragment" : "spgw_meta.teid = teid"
+            "source_fragment" : "fabric_meta.spgw.teid = teid"
           }
         },
         {
@@ -1488,9 +1530,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 63,
+            "line" : 64,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
           }
         },
         {
@@ -1507,187 +1549,24 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 64,
+            "line" : 65,
             "column" : 8,
-            "source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr"
+            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.drop",
-      "id" : 12,
+      "name" : "FabricIngress.filtering.deny",
+      "id" : 11,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 13,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 14,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "cfi"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "pri"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 52,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 99,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
+              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -1706,22 +1585,82 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
+            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 15,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 12,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 13,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 16,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -1743,7 +1682,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -1752,6 +1691,87 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
+      "id" : 15,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "id" : 16,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 62,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
       "id" : 17,
       "runtime_data" : [
         {
@@ -1774,61 +1794,21 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 37,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "name" : "FabricIngress.forwarding.nop_routing_v4",
       "id" : 18,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 60,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 61,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
+      "runtime_data" : [],
+      "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
+      "name" : "FabricIngress.acl.set_next_id_acl",
       "id" : 19,
       "runtime_data" : [
         {
@@ -1850,8 +1830,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -1859,46 +1839,9 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_routing_v4",
+      "name" : "FabricIngress.acl.punt_to_cpu",
       "id" : 20,
       "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
-      "id" : 21,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
-      "id" : 22,
-      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "assign",
@@ -1913,27 +1856,46 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 116,
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
         },
         {
-          "op" : "exit",
-          "parameters" : [],
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 118,
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
             "column" : 8,
-            "source_fragment" : "exit"
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.clone_to_cpu",
-      "id" : 23,
+      "name" : "FabricIngress.acl.clone_to_cpu",
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1959,8 +1921,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 123,
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "fabric_metadata.clone_to_cpu = true"
           }
@@ -1968,34 +1930,63 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
-      "id" : 24,
+      "name" : "FabricIngress.acl.drop",
+      "id" : 22,
       "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 128,
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
+          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_acl",
-      "id" : 25,
+      "name" : "FabricIngress.acl.nop_acl",
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 26,
+      "id" : 24,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
+          "name" : "vlan_id",
           "bitwidth" : 12
         }
       ],
@@ -2005,7 +1996,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
             },
             {
               "type" : "runtime_data",
@@ -2014,15 +2005,77 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 61,
+            "line" : 70,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.output_simple",
+      "name" : "FabricIngress.next.output_xconnect",
+      "id" : 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", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
       "id" : 27,
       "runtime_data" : [
         {
@@ -2045,24 +2098,28 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.set_vlan_output",
+      "name" : "FabricIngress.next.routing_hashed",
       "id" : 28,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
           "name" : "port_num",
           "bitwidth" : 9
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "dmac",
+          "bitwidth" : 48
         }
       ],
       "primitives" : [
@@ -2071,18 +2128,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
+              "value" : ["ethernet", "src_addr"]
             },
             {
               "type" : "runtime_data",
-              "value" : 0
+              "value" : 1
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 90,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "dst_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
           }
         },
         {
@@ -2094,20 +2170,20 @@
             },
             {
               "type" : "runtime_data",
-              "value" : 1
+              "value" : 0
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_simple",
+      "name" : "FabricIngress.next.mpls_routing_hashed",
       "id" : 29,
       "runtime_data" : [
         {
@@ -2121,6 +2197,10 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -2129,6 +2209,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -2138,7 +2237,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2176,960 +2275,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_simple",
+      "name" : "FabricIngress.next.set_mcast_group_id",
       "id" : 30,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_simple",
-      "id" : 31,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_vlan",
-      "id" : 32,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_hashed",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
-      "id" : 34,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 35,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 36,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -3148,9 +2306,9 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "standard_metadata.mcast_grp = gid"
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
         },
         {
@@ -3177,7 +2335,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -3186,7 +2344,7 @@
     },
     {
       "name" : "act",
-      "id" : 37,
+      "id" : 31,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3194,7 +2352,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3222,7 +2380,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 38,
+      "id" : 32,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3235,7 +2393,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -3250,7 +2408,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 55,
+            "line" : 57,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -3260,7 +2418,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+              "value" : ["scalars", "spgw_normalizer_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3282,7 +2440,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 39,
+      "id" : 33,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3308,7 +2466,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 40,
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3330,7 +2488,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 41,
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3394,7 +2552,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 42,
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3411,7 +2569,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 26,
+            "line" : 25,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
           }
@@ -3426,7 +2584,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -3455,7 +2613,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -3464,7 +2622,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 43,
+      "id" : 37,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3472,7 +2630,116 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 103,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_6",
+      "id" : 38,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x41"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 113,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
+      "id" : 39,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -3493,8 +2760,8 @@
       ]
     },
     {
-      "name" : "act_6",
-      "id" : 44,
+      "name" : "act_8",
+      "id" : 40,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3502,7 +2769,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_1"]
+              "value" : ["scalars", "spgw_ingress_tmp"]
             },
             {
               "type" : "expression",
@@ -3523,8 +2790,25 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 45,
+      "name" : "act_9",
+      "id" : 41,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 148,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3541,7 +2825,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 137,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -3549,94 +2833,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 46,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
-      "id" : 47,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 48,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x02"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 130,
-            "column" : 38,
-            "source_fragment" : "2w2; ..."
-          }
-        }
-      ]
-    },
-    {
       "name" : "act_11",
-      "id" : 49,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3644,26 +2842,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 128,
-            "column" : 37,
-            "source_fragment" : "2w0; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -3679,19 +2858,13 @@
                 }
               }
             }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 153,
-            "column" : 12,
-            "source_fragment" : "return"
-          }
+          ]
         }
       ]
     },
     {
       "name" : "act_12",
-      "id" : 50,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3699,7 +2872,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+              "value" : ["scalars", "spgw_ingress_tmp_0"]
             },
             {
               "type" : "expression",
@@ -3721,7 +2894,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 51,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3729,25 +2902,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["userMetadata.spgw", "direction"]
             },
             {
-              "type" : "field",
-              "value" : ["ipv4", "total_len"]
+              "type" : "hexstr",
+              "value" : "0x02"
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 170,
-            "column" : 8,
-            "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
+            "filename" : "include/control/../define.p4",
+            "line" : 138,
+            "column" : 38,
+            "source_fragment" : "2w2; ..."
           }
         }
       ]
     },
     {
       "name" : "act_14",
-      "id" : 52,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3755,7 +2928,26 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["userMetadata.spgw", "direction"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 136,
+            "column" : 37,
+            "source_fragment" : "2w0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3771,13 +2963,19 @@
                 }
               }
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 157,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
         }
       ]
     },
     {
       "name" : "act_15",
-      "id" : 53,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3785,7 +2983,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
             },
             {
               "type" : "expression",
@@ -3807,7 +3005,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 54,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3815,346 +3013,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["userMetadata.spgw", "ipv4_len"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x07"
+              "type" : "field",
+              "value" : ["ipv4", "total_len"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 119,
-            "column" : 31,
-            "source_fragment" : "7; ..."
+            "filename" : "include/spgw.p4",
+            "line" : 174,
+            "column" : 8,
+            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
           }
         }
       ]
     },
     {
       "name" : "act_17",
-      "id" : 55,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 102,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_18",
-      "id" : 56,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_19",
-      "id" : 57,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_20",
-      "id" : 58,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_21",
-      "id" : 59,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_22",
-      "id" : 60,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_23",
-      "id" : 61,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_24",
-      "id" : 62,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_25",
-      "id" : 63,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 223,
-            "column" : 20,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_26",
-      "id" : 64,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv4", "ttl"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv4", "ttl"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 230,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_27",
-      "id" : 65,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4184,7 +3061,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
           }
@@ -4203,7 +3080,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
           }
@@ -4211,8 +3088,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 66,
+      "name" : "act_18",
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4242,7 +3119,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
           }
@@ -4261,7 +3138,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
           }
@@ -4270,67 +3147,13 @@
     },
     {
       "name" : "nop",
-      "id" : 67,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 68,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "drop_now",
-      "id" : 69,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
-    },
-    {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 70,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4343,7 +3166,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 185,
+            "line" : 190,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
           }
@@ -4362,7 +3185,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 186,
+            "line" : 191,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
           }
@@ -4381,7 +3204,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 111,
+            "line" : 119,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -4400,7 +3223,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 188,
+            "line" : 193,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dscp = 0"
           }
@@ -4419,7 +3242,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 189,
+            "line" : 194,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.ecn = 0"
           }
@@ -4461,7 +3284,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 190,
+            "line" : 195,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
           }
@@ -4480,7 +3303,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 192,
+            "line" : 197,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
           }
@@ -4499,7 +3322,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 193,
+            "line" : 198,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
           }
@@ -4518,7 +3341,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 194,
+            "line" : 199,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
           }
@@ -4537,7 +3360,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 132,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -4556,7 +3379,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 116,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4575,9 +3398,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 197,
+            "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
           }
         },
         {
@@ -4594,9 +3417,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 198,
+            "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
           }
         },
         {
@@ -4613,7 +3436,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 199,
+            "line" : 204,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
           }
@@ -4628,7 +3451,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 201,
+            "line" : 206,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
           }
@@ -4638,7 +3461,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "src_port"]
+              "value" : ["gtpu_udp", "sport"]
             },
             {
               "type" : "hexstr",
@@ -4647,9 +3470,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 202,
+            "line" : 207,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.src_port = 2152"
+            "source_fragment" : "gtpu_udp.sport = 2152"
           }
         },
         {
@@ -4657,7 +3480,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_udp", "dst_port"]
+              "value" : ["gtpu_udp", "dport"]
             },
             {
               "type" : "hexstr",
@@ -4666,9 +3489,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 203,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.dst_port = 2152"
+            "source_fragment" : "gtpu_udp.dport = 2152"
           }
         },
         {
@@ -4708,9 +3531,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 204,
+            "line" : 209,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
+            "source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
           }
         },
         {
@@ -4727,7 +3550,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 206,
+            "line" : 211,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
           }
@@ -4742,7 +3565,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 208,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
           }
@@ -4761,7 +3584,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 209,
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
           }
@@ -4780,7 +3603,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 210,
+            "line" : 215,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
           }
@@ -4799,7 +3622,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 211,
+            "line" : 216,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
           }
@@ -4818,7 +3641,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 212,
+            "line" : 217,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
           }
@@ -4837,7 +3660,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 213,
+            "line" : 218,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
           }
@@ -4856,7 +3679,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 214,
+            "line" : 219,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
           }
@@ -4875,7 +3698,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 215,
+            "line" : 220,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
           }
@@ -4894,9 +3717,9 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 216,
+            "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
           }
         },
         {
@@ -4913,76 +3736,310 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 217,
+            "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = spgw_meta.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
           }
         }
       ]
     },
     {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 71,
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 40,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
           "op" : "remove_header",
           "parameters" : [
             {
               "type" : "header",
-              "value" : "vlan_tag"
+              "value" : "mpls"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 41,
+            "filename" : "include/control/next.p4",
+            "line" : 246,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+            "source_fragment" : "hdr.mpls.setInvalid()"
           }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 72,
-      "runtime_data" : [],
-      "primitives" : [
+        },
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 248,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 54,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 253,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 255,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 256,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 257,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 55,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 266,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 267,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 269,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 56,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 280,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
           }
         },
         {
@@ -4995,7 +4052,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -5003,8 +4060,25 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 73,
+      "name" : "act_19",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_20",
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5017,7 +4091,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 57,
+            "line" : 49,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -5036,12 +4110,221 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 58,
+            "line" : 50,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
         }
       ]
+    },
+    {
+      "name" : "act_21",
+      "id" : 59,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_22",
+      "id" : 60,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_23",
+      "id" : 61,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_24",
+      "id" : 62,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_25",
+      "id" : 63,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_26",
+      "id" : 64,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_27",
+      "id" : 65,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 323,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
+          }
+        }
+      ]
     }
   ],
   "pipelines" : [
@@ -5050,7 +4333,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -5066,14 +4349,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
+          "action_ids" : [32],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5089,14 +4372,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37],
+          "action_ids" : [31],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 31,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5112,14 +4395,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
+          "action_ids" : [35],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5135,14 +4418,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
+          "action_ids" : [33],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 33,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5158,14 +4441,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [34],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 34,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5181,14 +4464,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
+          "action_ids" : [36],
           "actions" : ["act_4"],
           "base_default_next" : null,
           "next_tables" : {
             "act_4" : null
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 36,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5204,14 +4487,158 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_13",
+          "action_ids" : [37],
+          "actions" : ["act_5"],
+          "base_default_next" : "node_14",
           "next_tables" : {
-            "act_12" : "node_13"
+            "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 37,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_6",
+          "id" : 7,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [38],
+          "actions" : ["act_6"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_6" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 38,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "id" : 8,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 51,
+            "column" : 10,
+            "source_fragment" : "ingress_port_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "vlan_is_valid",
+              "target" : ["vlan_tag", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [11, 12, 13],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+          "next_tables" : {
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
+          },
+          "default_entry" : {
+            "action_id" : 11,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.fwd_classifier",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 86,
+            "column" : 10,
+            "source_fragment" : "fwd_classifier"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_dst",
+              "target" : ["ethernet", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [14],
+          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
+          "base_default_next" : "tbl_act_7",
+          "next_tables" : {
+            "FabricIngress.filtering.set_forwarding_type" : "tbl_act_7"
+          },
+          "default_entry" : {
+            "action_id" : 14,
+            "action_const" : true,
+            "action_data" : ["0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 10,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [47],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_19",
+          "next_tables" : {
+            "act_15" : "node_19"
+          },
+          "default_entry" : {
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5219,17 +4646,17 @@
         },
         {
           "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
-          "id" : 7,
+          "id" : 11,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 79,
+            "line" : 82,
             "column" : 10,
             "source_fragment" : "s1u_filter_table"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "gtpu_ipv4.dst_addr",
+              "name" : "gtp_ipv4_dst",
               "target" : ["gtpu_ipv4", "dst_addr"],
               "mask" : null
             }
@@ -5241,22 +4668,22 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [1],
-          "actions" : ["NoAction"],
+          "actions" : ["nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_6",
-            "__MISS__" : "tbl_act_7"
+            "__HIT__" : "tbl_act_8",
+            "__MISS__" : "tbl_act_9"
           },
           "default_entry" : {
             "action_id" : 1,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_6",
-          "id" : 8,
+          "name" : "tbl_act_8",
+          "id" : 12,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5264,22 +4691,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_17",
+          "action_ids" : [39],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_5" : "node_17"
+            "act_7" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 39,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 9,
+          "name" : "tbl_act_9",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5287,22 +4714,68 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_17",
+          "action_ids" : [40],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_23",
           "next_tables" : {
-            "act_6" : "node_17"
+            "act_8" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 40,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 10,
+          "name" : "tbl_act_10",
+          "id" : 14,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [41],
+          "actions" : ["act_9"],
+          "base_default_next" : "tbl_act_11",
+          "next_tables" : {
+            "act_9" : "tbl_act_11"
+          },
+          "default_entry" : {
+            "action_id" : 41,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_11",
+          "id" : 15,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [42],
+          "actions" : ["act_10"],
+          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
+          "next_tables" : {
+            "act_10" : "tbl_spgw_ingress_gtpu_decap"
+          },
+          "default_entry" : {
+            "action_id" : 42,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_ingress_gtpu_decap",
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5311,10 +4784,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [9],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_8",
+          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "drop_now" : "tbl_act_8"
+            "FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
           },
           "default_entry" : {
             "action_id" : 9,
@@ -5324,64 +4797,18 @@
           }
         },
         {
-          "name" : "tbl_act_8",
-          "id" : 11,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_7"],
-          "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
-          "next_tables" : {
-            "act_7" : "tbl_spgw_ingress_gtpu_decap"
-          },
-          "default_entry" : {
-            "action_id" : 45,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_ingress_gtpu_decap",
-          "id" : 12,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [10],
-          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 10,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
-          "id" : 13,
+          "id" : 17,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 68,
+            "line" : 69,
             "column" : 10,
             "source_fragment" : "dl_sess_lookup"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -5392,84 +4819,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11, 0],
-          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
+          "action_ids" : [10, 0],
+          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
+            "__HIT__" : "tbl_act_12",
+            "__MISS__" : "tbl_act_13"
           },
           "default_entry" : {
             "action_id" : 0,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 14,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_8" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 46,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 15,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_24",
-          "next_tables" : {
-            "act_9" : "node_24"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 16,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_10" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5477,29 +4835,6 @@
         },
         {
           "name" : "tbl_act_12",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_11" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 49,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
           "id" : 18,
           "key" : [],
           "match_type" : "exact",
@@ -5508,65 +4843,39 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["act_13"],
-          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "action_ids" : [43],
+          "actions" : ["act_11"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "act_13" : "FabricIngress.filtering.ingress_port_vlan"
+            "act_11" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "name" : "tbl_act_13",
           "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 66,
-            "column" : 10,
-            "source_fragment" : "ingress_port_vlan"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.is_valid",
-              "target" : ["vlan_tag", "$valid$"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
+          "key" : [],
+          "match_type" : "exact",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : true,
+          "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 13, 12, 15],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
+          "action_ids" : [44],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_30",
           "next_tables" : {
-            "__HIT__" : "tbl_act_14",
-            "__MISS__" : "tbl_act_15"
+            "act_12" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 14,
+            "action_id" : 44,
             "action_const" : true,
-            "action_data" : ["0xffe"],
+            "action_data" : [],
             "action_entry_const" : true
           }
         },
@@ -5580,14 +4889,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_14"],
-          "base_default_next" : "node_32",
+          "action_ids" : [45],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_14" : "node_32"
+            "act_13" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5603,70 +4912,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_32",
+          "action_ids" : [46],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_15" : "node_32"
+            "act_14" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.filtering.fwd_classifier",
-          "id" : 22,
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 103,
-            "column" : 10,
-            "source_fragment" : "fwd_classifier"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
-              "target" : ["standard_metadata", "ingress_port"],
-              "mask" : null
-            },
-            {
-              "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
-              "target" : ["ethernet", "dst_addr"],
-              "mask" : null
-            },
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "ternary",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [16],
-          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
-          "base_default_next" : "node_35",
-          "next_tables" : {
-            "FabricIngress.filtering.set_forwarding_type" : "node_35"
-          },
-          "default_entry" : {
-            "action_id" : 16,
-            "action_const" : true,
-            "action_data" : ["0x0"],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_16",
-          "id" : 23,
+          "id" : 22,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5674,14 +4935,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
+          "action_ids" : [48],
           "actions" : ["act_16"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "act_16" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5689,23 +4950,23 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 24,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 10,
             "source_fragment" : "bridging"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -5716,34 +4977,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 2],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [15, 2],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 25,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "mpls"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.mpls.label",
-              "target" : ["mpls", "label"],
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
               "mask" : null
             }
           ],
@@ -5753,38 +5014,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 3],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_17",
+          "action_ids" : [16, 3],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_17",
-            "NoAction" : "tbl_act_17"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 3,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_17",
-          "id" : 26,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["act_17"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_17" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5792,17 +5030,17 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 27,
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 91,
+            "line" : 93,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -5813,100 +5051,100 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 20, 4],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [17, 18, 4],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
-            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 4,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 28,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 26,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 136,
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
             "column" : 10,
             "source_fragment" : "acl"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.ip_proto",
+              "name" : "ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_src",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.src_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_type",
+              "name" : "icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_code",
+              "name" : "icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -5917,26 +5155,178 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 22, 23, 24, 25],
-          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_18",
+          "action_ids" : [19, 20, 21, 22, 23],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_43",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_18",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_18",
-            "FabricIngress.forwarding.drop" : "tbl_act_18",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_18"
+            "FabricIngress.acl.set_next_id_acl" : "node_43",
+            "FabricIngress.acl.punt_to_cpu" : "node_43",
+            "FabricIngress.acl.clone_to_cpu" : "node_43",
+            "FabricIngress.acl.drop" : "node_43",
+            "FabricIngress.acl.nop_acl" : "node_43"
           },
           "default_entry" : {
-            "action_id" : 25,
+            "action_id" : 23,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [25, 26, 6],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.hashed",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 6,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 180,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [27, 28, 29, 7],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
           "id" : 29,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [30, 8],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 8,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [24, 5],
+          "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" : 5,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 31,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5944,95 +5334,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["act_18"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [49],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "act_18" : "FabricIngress.next.vlan_meta"
+            "act_17" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 30,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 65,
-            "column" : 10,
-            "source_fragment" : "vlan_meta"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [26, 8],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "FabricIngress.next.simple",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "FabricIngress.next.simple",
-            "nop" : "FabricIngress.next.simple"
-          },
-          "default_entry" : {
-            "action_id" : 8,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.next.simple",
-          "id" : 31,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 122,
-            "column" : 10,
-            "source_fragment" : "simple"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [27, 28, 29, 30, 31, 32, 5],
-          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_19",
-            "__MISS__" : "tbl_act_20"
-          },
-          "default_entry" : {
-            "action_id" : 5,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_19",
+          "name" : "tbl_act_18",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -6041,290 +5357,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_48",
-          "next_tables" : {
-            "act_19" : "node_48"
-          },
-          "default_entry" : {
-            "action_id" : 57,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 33,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [58],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_48",
-          "next_tables" : {
-            "act_20" : "node_48"
-          },
-          "default_entry" : {
-            "action_id" : 58,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 34,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 175,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "FabricIngress.next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [33, 34, 35, 6],
-          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
+          "action_ids" : [50],
+          "actions" : ["act_18"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_21",
-            "__MISS__" : "tbl_act_22"
-          }
-        },
-        {
-          "name" : "tbl_act_21",
-          "id" : 35,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_52",
-          "next_tables" : {
-            "act_21" : "node_52"
+            "act_18" : null
           },
           "default_entry" : {
-            "action_id" : 59,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_22",
-          "id" : 36,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [60],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_52",
-          "next_tables" : {
-            "act_22" : "node_52"
-          },
-          "default_entry" : {
-            "action_id" : 60,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 37,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 207,
-            "column" : 10,
-            "source_fragment" : "multicast"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [36, 7],
-          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_23",
-            "__MISS__" : "tbl_act_24"
-          },
-          "default_entry" : {
-            "action_id" : 7,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_23",
-          "id" : 38,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_56",
-          "next_tables" : {
-            "act_23" : "node_56"
-          },
-          "default_entry" : {
-            "action_id" : 61,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_24",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_56",
-          "next_tables" : {
-            "act_24" : "node_56"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_25",
-          "id" : 40,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_58",
-          "next_tables" : {
-            "act_25" : "node_58"
-          },
-          "default_entry" : {
-            "action_id" : 63,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_26",
-          "id" : 41,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_62",
-          "next_tables" : {
-            "act_26" : "node_62"
-          },
-          "default_entry" : {
-            "action_id" : 64,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_27",
-          "id" : 42,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_64",
-          "next_tables" : {
-            "act_27" : "node_64"
-          },
-          "default_entry" : {
-            "action_id" : 65,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_28",
-          "id" : 43,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_28"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "act_28" : null
-          },
-          "default_entry" : {
-            "action_id" : 66,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6333,13 +5373,13 @@
       ],
       "action_profiles" : [
         {
-          "name" : "FabricIngress.next.ecmp_selector",
+          "name" : "FabricIngress.next.hashed_selector",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 145,
+            "line" : 161,
             "column" : 55,
-            "source_fragment" : "ecmp_selector"
+            "source_fragment" : "hashed_selector"
           },
           "max_size" : 64,
           "selector" : {
@@ -6359,11 +5399,11 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
               }
             ]
           }
@@ -6415,7 +5455,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_normalizer_hasReturned_0"]
+                    "value" : ["scalars", "spgw_normalizer_hasReturned"]
                   }
                 }
               }
@@ -6452,7 +5492,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -6468,14 +5508,67 @@
             }
           },
           "true_next" : "tbl_act_4",
-          "false_next" : "tbl_act_5"
+          "false_next" : "node_12"
         },
         {
-          "name" : "node_13",
+          "name" : "node_12",
           "id" : 4,
           "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 102,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["vlan_tag", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_5",
+          "false_next" : "node_14"
+        },
+        {
+          "name" : "node_14",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_6",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+        },
+        {
+          "name" : "node_19",
+          "id" : 6,
+          "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 139,
+            "line" : 143,
             "column" : 12,
             "source_fragment" : "gtpu.isValid()"
           },
@@ -6494,11 +5587,11 @@
           "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
         },
         {
-          "name" : "node_17",
-          "id" : 5,
+          "name" : "node_23",
+          "id" : 7,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 143,
+            "line" : 147,
             "column" : 16,
             "source_fragment" : "!s1u_filter_table.apply().hit"
           },
@@ -6514,18 +5607,18 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_tmp_1"]
+                    "value" : ["scalars", "spgw_ingress_tmp"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_drop_now",
-          "false_next" : "tbl_act_8"
+          "true_next" : "tbl_act_10",
+          "false_next" : "tbl_act_11"
         },
         {
-          "name" : "node_24",
-          "id" : 6,
+          "name" : "node_30",
+          "id" : 8,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -6533,16 +5626,16 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "spgw_ingress_tmp_2"]
+                "value" : ["scalars", "spgw_ingress_tmp_0"]
               }
             }
           },
-          "true_next" : "tbl_act_11",
-          "false_next" : "tbl_act_12"
+          "true_next" : "tbl_act_14",
+          "false_next" : "tbl_act_15"
         },
         {
-          "name" : "node_27",
-          "id" : 7,
+          "name" : "node_33",
+          "id" : 9,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -6555,39 +5648,55 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "spgw_ingress_hasReturned_0"]
+                    "value" : ["scalars", "spgw_ingress_hasReturned"]
                   }
                 }
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
-        },
-        {
-          "name" : "node_32",
-          "id" : 8,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["scalars", "filtering_tmp_0"]
-              }
-            }
-          },
-          "true_next" : "FabricIngress.filtering.fwd_classifier",
-          "false_next" : "tbl_act_16"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_35"
         },
         {
           "name" : "node_35",
-          "id" : 9,
+          "id" : 10,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_36",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_36",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 191,
-            "column" : 11,
+            "line" : 131,
+            "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
           "expression" : {
@@ -6605,14 +5714,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_37"
+          "false_next" : "node_38"
         },
         {
-          "name" : "node_37",
-          "id" : 10,
+          "name" : "node_38",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 192,
+            "line" : 132,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -6635,10 +5744,10 @@
         },
         {
           "name" : "node_40",
-          "id" : 11,
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 198,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -6657,181 +5766,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_43",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 70,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
           "name" : "node_48",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 219,
-            "column" : 12,
-            "source_fragment" : "!simple.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_4"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_58"
-        },
-        {
-          "name" : "node_52",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 220,
-            "column" : 16,
-            "source_fragment" : "!hashed.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_3"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_58"
-        },
-        {
-          "name" : "node_56",
-          "id" : 14,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 221,
-            "column" : 20,
-            "source_fragment" : "!multicast.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_2"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_58"
-        },
-        {
-          "name" : "node_58",
           "id" : 15,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_hasReturned_0"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_59",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_59",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
-            "column" : 12,
-            "source_fragment" : "!hdr.mpls.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["mpls", "$valid$"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_60",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_60",
-          "id" : 17,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 229,
-            "column" : 15,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_62"
-        },
-        {
-          "name" : "node_62",
-          "id" : 18,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -6849,15 +5824,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_64"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_64",
-          "id" : 19,
+          "name" : "node_50",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -6876,7 +5851,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_28"
+          "true_next" : "tbl_act_18"
         }
       ]
     },
@@ -6885,15 +5860,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_68",
+      "init_table" : "node_54",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 44,
+          "name" : "tbl_act_19",
+          "id" : 33,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6901,22 +5876,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_72",
+          "action_ids" : [57],
+          "actions" : ["act_19"],
+          "base_default_next" : "tbl_act_20",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_72"
+            "act_19" : "tbl_act_20"
           },
           "default_entry" : {
-            "action_id" : 71,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 45,
+          "name" : "tbl_act_20",
+          "id" : 34,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6924,45 +5899,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_29",
-          "next_tables" : {
-            "drop_now" : "tbl_act_29"
-          },
-          "default_entry" : {
-            "action_id" : 68,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_29",
-          "id" : 46,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_29"],
+          "action_ids" : [58],
+          "actions" : ["act_20"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_29" : null
+            "act_20" : null
           },
           "default_entry" : {
-            "action_id" : 73,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_1",
-          "id" : 47,
+          "name" : "tbl_act_21",
+          "id" : 35,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6970,14 +5922,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [69],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [59],
+          "actions" : ["act_21"],
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_21" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 69,
+            "action_id" : 59,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 36,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [53],
+          "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" : 53,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 37,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [54],
+          "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" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6985,23 +5983,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 48,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 258,
+            "line" : 285,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_port",
+              "name" : "eg_port",
               "target" : ["standard_metadata", "egress_port"],
               "mask" : null
             }
@@ -7012,23 +6010,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [72, 67],
+          "action_ids" : [56, 51],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_78",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_78",
-            "nop" : "node_78"
+            "__HIT__" : "tbl_act_22",
+            "__MISS__" : "tbl_act_23"
           },
           "default_entry" : {
-            "action_id" : 67,
-            "action_const" : false,
+            "action_id" : 51,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 49,
+          "name" : "tbl_act_22",
+          "id" : 39,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -7036,14 +6034,175 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70],
+          "action_ids" : [60],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_68",
+          "next_tables" : {
+            "act_22" : "node_68"
+          },
+          "default_entry" : {
+            "action_id" : 60,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_23",
+          "id" : 40,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [61],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_68",
+          "next_tables" : {
+            "act_23" : "node_68"
+          },
+          "default_entry" : {
+            "action_id" : 61,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 41,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [55],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_71",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_71"
+          },
+          "default_entry" : {
+            "action_id" : 55,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_24",
+          "id" : 42,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [63],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_73",
+          "next_tables" : {
+            "act_25" : "node_73"
+          },
+          "default_entry" : {
+            "action_id" : 63,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_25",
+          "id" : 43,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [62],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_79",
+          "next_tables" : {
+            "act_24" : "node_79"
+          },
+          "default_entry" : {
+            "action_id" : 62,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_26",
+          "id" : 44,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [65],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_77",
+          "next_tables" : {
+            "act_27" : "node_77"
+          },
+          "default_entry" : {
+            "action_id" : 65,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_27",
+          "id" : 45,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [64],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_79",
+          "next_tables" : {
+            "act_26" : "node_79"
+          },
+          "default_entry" : {
+            "action_id" : 64,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_spgw_egress_gtpu_encap",
+          "id" : 46,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [52],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.spgw_egress.gtpu_encap" : null
           },
           "default_entry" : {
-            "action_id" : 70,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -7053,11 +6212,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_68",
-          "id" : 20,
+          "name" : "node_54",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -7083,14 +6242,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_69"
+          "false_next" : "node_55"
         },
         {
-          "name" : "node_69",
-          "id" : 21,
+          "name" : "node_55",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -7108,65 +6267,15 @@
               }
             }
           },
-          "true_next" : "node_70",
-          "false_next" : "node_75"
+          "true_next" : "node_56",
+          "false_next" : "node_59"
         },
         {
-          "name" : "node_70",
-          "id" : 22,
+          "name" : "node_56",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["vlan_tag", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_72"
-        },
-        {
-          "name" : "node_72",
-          "id" : 23,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -7218,15 +6327,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
-          "false_next" : "tbl_act_29"
+          "true_next" : "tbl_act_19",
+          "false_next" : "tbl_act_20"
         },
         {
-          "name" : "node_75",
-          "id" : 24,
+          "name" : "node_59",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -7271,17 +6380,220 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_1",
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_61"
+        },
+        {
+          "name" : "node_61",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 304,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_62",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_62",
+          "id" : 22,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 305,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_78",
+          "name" : "node_68",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_69",
+          "false_next" : "node_71"
+        },
+        {
+          "name" : "node_69",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_71"
+        },
+        {
+          "name" : "node_71",
           "id" : 25,
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 221,
+            "filename" : "include/control/next.p4",
+            "line" : 318,
             "column" : 12,
-            "source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK"
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_75"
+        },
+        {
+          "name" : "node_73",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_25",
+          "false_next" : "node_79"
+        },
+        {
+          "name" : "node_75",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 322,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_26",
+          "false_next" : "node_79"
+        },
+        {
+          "name" : "node_77",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_79"
+        },
+        {
+          "name" : "node_79",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 226,
+            "column" : 12,
+            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
           },
           "expression" : {
             "type" : "expression",
@@ -7333,7 +6645,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 237,
+        "line" : 242,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index 40d1a1c..a0fe167 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -6,7 +6,7 @@
   }
   match_fields {
     id: 1
-    name: "ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: EXACT
   }
@@ -14,12 +14,12 @@
     id: 16804065
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318781522
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -29,15 +29,15 @@
   }
   match_fields {
     id: 1
-    name: "gtpu_ipv4.dst_addr"
+    name: "gtp_ipv4_dst"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800567
+    id: 16819938
   }
+  const_default_action_id: 16819938
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -47,38 +47,34 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.vlan_tag.is_valid"
+    name: "vlan_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   action_refs {
-    id: 16835546
+    id: 16836487
   }
   action_refs {
-    id: 16793253
+    id: 16818236
   }
   action_refs {
-    id: 16798734
+    id: 16794911
   }
-  action_refs {
-    id: 16833700
-  }
-  const_default_action_id: 16835546
+  const_default_action_id: 16836487
   direct_resource_ids: 318815501
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -88,19 +84,19 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: EXACT
   }
@@ -110,7 +106,6 @@
   const_default_action_id: 16840921
   direct_resource_ids: 318827326
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -120,13 +115,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
@@ -134,12 +129,12 @@
     id: 16811012
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318770289
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -149,7 +144,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.mpls.label"
+    name: "mpls_label"
     bitwidth: 20
     match_type: EXACT
   }
@@ -157,12 +152,12 @@
     id: 16827758
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318830507
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -172,7 +167,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: LPM
   }
@@ -183,120 +178,119 @@
     id: 16804187
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318811107
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33574876
-    name: "FabricIngress.forwarding.acl"
+    id: 33618978
+    name: "FabricIngress.acl.acl"
     alias: "acl"
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "fabric_metadata.ip_proto"
+    name: "ip_proto"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 5
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_src"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 6
-    name: "hdr.ethernet.src_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 7
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   match_fields {
     id: 8
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 9
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 10
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 11
-    name: "hdr.icmp.icmp_type"
+    name: "icmp_type"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 12
-    name: "hdr.icmp.icmp_code"
+    name: "icmp_code"
     bitwidth: 8
     match_type: TERNARY
   }
   action_refs {
-    id: 16785374
+    id: 16807382
   }
   action_refs {
-    id: 16801806
+    id: 16829684
   }
   action_refs {
-    id: 16784835
+    id: 16790975
   }
   action_refs {
-    id: 16833260
+    id: 16820765
   }
   action_refs {
-    id: 16842570
+    id: 16827694
   }
-  const_default_action_id: 16842570
-  direct_resource_ids: 318772272
+  const_default_action_id: 16827694
+  direct_resource_ids: 318801025
   size: 128
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33562709
-    name: "FabricIngress.next.vlan_meta"
-    alias: "vlan_meta"
+    id: 33599709
+    name: "FabricIngress.next.next_vlan"
+    alias: "next_vlan"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
@@ -307,47 +301,41 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318785328
+  const_default_action_id: 16819938
+  direct_resource_ids: 318768144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33571723
-    name: "FabricIngress.next.simple"
-    alias: "simple"
+    id: 33596977
+    name: "FabricIngress.next.xconnect"
+    alias: "xconnect"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16802668
+    id: 16842190
   }
   action_refs {
-    id: 16808391
+    id: 16837052
   }
   action_refs {
-    id: 16780007
-  }
-  action_refs {
-    id: 16806134
-  }
-  action_refs {
-    id: 16795970
-  }
-  action_refs {
-    id: 16791579
-  }
-  action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318769096
+  const_default_action_id: 16819938
+  direct_resource_ids: 318778156
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -357,27 +345,27 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800211
+    id: 16815357
   }
   action_refs {
-    id: 16779239
+    id: 16791402
   }
   action_refs {
-    id: 16819349
+    id: 16779255
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  implementation_id: 285233747
+  const_default_action_id: 16819938
+  implementation_id: 285217164
   direct_resource_ids: 318800532
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -387,20 +375,20 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16789575
+    id: 16779917
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318801752
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -410,13 +398,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "standard_metadata.egress_port"
+    name: "eg_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -427,16 +415,9 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318827144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
-  }
 }
 actions {
   preamble {
@@ -447,20 +428,6 @@
 }
 actions {
   preamble {
-    id: 16823970
-    name: "drop_now"
-    alias: "drop_now"
-  }
-}
-actions {
-  preamble {
-    id: 16819909
-    name: "FabricIngress.spgw_ingress.gtpu_decap"
-    alias: "gtpu_decap"
-  }
-}
-actions {
-  preamble {
     id: 16804065
     name: "FabricIngress.spgw_ingress.set_dl_sess_info"
     alias: "set_dl_sess_info"
@@ -483,44 +450,32 @@
 }
 actions {
   preamble {
-    id: 16798734
-    name: "FabricIngress.filtering.drop"
-    alias: "filtering.drop"
+    id: 16836487
+    name: "FabricIngress.filtering.deny"
+    alias: "deny"
   }
 }
 actions {
   preamble {
-    id: 16793253
-    name: "FabricIngress.filtering.set_vlan"
-    alias: "filtering.set_vlan"
+    id: 16818236
+    name: "FabricIngress.filtering.permit"
+    alias: "permit"
+  }
+}
+actions {
+  preamble {
+    id: 16794911
+    name: "FabricIngress.filtering.permit_with_internal_vlan"
+    alias: "permit_with_internal_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16835546
-    name: "FabricIngress.filtering.push_internal_vlan"
-    alias: "push_internal_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16833700
-    name: "FabricIngress.filtering.nop_ingress_port_vlan"
-    alias: "nop_ingress_port_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16840921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
@@ -576,8 +531,8 @@
 }
 actions {
   preamble {
-    id: 16785374
-    name: "FabricIngress.forwarding.set_next_id_acl"
+    id: 16807382
+    name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
   }
   params {
@@ -588,29 +543,29 @@
 }
 actions {
   preamble {
-    id: 16801806
-    name: "FabricIngress.forwarding.punt_to_cpu"
+    id: 16829684
+    name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16784835
-    name: "FabricIngress.forwarding.clone_to_cpu"
+    id: 16790975
+    name: "FabricIngress.acl.clone_to_cpu"
     alias: "clone_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16833260
-    name: "FabricIngress.forwarding.drop"
-    alias: "forwarding.drop"
+    id: 16820765
+    name: "FabricIngress.acl.drop"
+    alias: "drop"
   }
 }
 actions {
   preamble {
-    id: 16842570
-    name: "FabricIngress.forwarding.nop_acl"
+    id: 16827694
+    name: "FabricIngress.acl.nop_acl"
     alias: "nop_acl"
   }
 }
@@ -618,19 +573,19 @@
   preamble {
     id: 16790685
     name: "FabricIngress.next.set_vlan"
-    alias: "next.set_vlan"
+    alias: "set_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16802668
-    name: "FabricIngress.next.output_simple"
-    alias: "output_simple"
+    id: 16842190
+    name: "FabricIngress.next.output_xconnect"
+    alias: "output_xconnect"
   }
   params {
     id: 1
@@ -640,26 +595,33 @@
 }
 actions {
   preamble {
-    id: 16808391
-    name: "FabricIngress.next.set_vlan_output"
-    alias: "set_vlan_output"
+    id: 16837052
+    name: "FabricIngress.next.set_next_id_xconnect"
+    alias: "set_next_id_xconnect"
   }
   params {
     id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16815357
+    name: "FabricIngress.next.output_hashed"
+    alias: "output_hashed"
   }
   params {
-    id: 2
+    id: 1
     name: "port_num"
     bitwidth: 9
   }
 }
 actions {
   preamble {
-    id: 16780007
-    name: "FabricIngress.next.l3_routing_simple"
-    alias: "l3_routing_simple"
+    id: 16791402
+    name: "FabricIngress.next.routing_hashed"
+    alias: "routing_hashed"
   }
   params {
     id: 1
@@ -679,9 +641,9 @@
 }
 actions {
   preamble {
-    id: 16806134
-    name: "FabricIngress.next.mpls_routing_v4_simple"
-    alias: "mpls_routing_v4_simple"
+    id: 16779255
+    name: "FabricIngress.next.mpls_routing_hashed"
+    alias: "mpls_routing_hashed"
   }
   params {
     id: 1
@@ -706,172 +668,28 @@
 }
 actions {
   preamble {
-    id: 16795970
-    name: "FabricIngress.next.mpls_routing_v6_simple"
-    alias: "mpls_routing_v6_simple"
+    id: 16779917
+    name: "FabricIngress.next.set_mcast_group_id"
+    alias: "set_mcast_group_id"
   }
   params {
     id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16791579
-    name: "FabricIngress.next.l3_routing_vlan"
-    alias: "l3_routing_vlan"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16800211
-    name: "FabricIngress.next.l3_routing_hashed"
-    alias: "l3_routing_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-}
-actions {
-  preamble {
-    id: 16779239
-    name: "FabricIngress.next.mpls_routing_v4_hashed"
-    alias: "mpls_routing_v4_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16819349
-    name: "FabricIngress.next.mpls_routing_v6_hashed"
-    alias: "mpls_routing_v6_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16789575
-    name: "FabricIngress.next.set_mcast_group"
-    alias: "set_mcast_group"
-  }
-  params {
-    id: 1
-    name: "gid"
+    name: "group_id"
     bitwidth: 16
   }
 }
 actions {
   preamble {
-    id: 16829135
-    name: "FabricEgress.spgw_egress.gtpu_encap"
-    alias: "gtpu_encap"
-  }
-}
-actions {
-  preamble {
-    id: 16801047
-    name: "FabricEgress.pkt_io_egress.pop_vlan"
-    alias: "pkt_io_egress.pop_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16790030
     name: "FabricEgress.egress_next.pop_vlan"
-    alias: "egress_next.pop_vlan"
+    alias: "pop_vlan"
   }
 }
 action_profiles {
   preamble {
-    id: 285233747
-    name: "FabricIngress.next.ecmp_selector"
-    alias: "ecmp_selector"
+    id: 285217164
+    name: "FabricIngress.next.hashed_selector"
+    alias: "hashed_selector"
   }
   table_ids: 33608588
   with_selector: true
@@ -967,36 +785,36 @@
 }
 direct_counters {
   preamble {
-    id: 318772272
-    name: "FabricIngress.forwarding.acl_counter"
+    id: 318801025
+    name: "FabricIngress.acl.acl_counter"
     alias: "acl_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33574876
+  direct_table_id: 33618978
 }
 direct_counters {
   preamble {
-    id: 318785328
-    name: "FabricIngress.next.vlan_meta_counter"
-    alias: "vlan_meta_counter"
+    id: 318768144
+    name: "FabricIngress.next.next_vlan_counter"
+    alias: "next_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33562709
+  direct_table_id: 33599709
 }
 direct_counters {
   preamble {
-    id: 318769096
-    name: "FabricIngress.next.simple_counter"
-    alias: "simple_counter"
+    id: 318778156
+    name: "FabricIngress.next.xconnect_counter"
+    alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33571723
+  direct_table_id: 33596977
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 6a4bdb1..7a82d6b 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -4,23 +4,28 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["tmp", 4, false],
-        ["tmp_0", 32, false],
+        ["tmp_0", 4, false],
+        ["tmp", 32, false],
         ["tmp_1", 32, false],
-        ["filtering_tmp_0", 1, false],
-        ["next_tmp_2", 1, false],
-        ["next_tmp_3", 1, false],
-        ["next_tmp_4", 1, false],
-        ["next_hasReturned_0", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["fabric_metadata_t.eth_type", 16, false],
+        ["fabric_metadata_t.ip_eth_type", 16, false],
+        ["fabric_metadata_t.vlan_id", 12, false],
+        ["fabric_metadata_t.vlan_pri", 3, false],
+        ["fabric_metadata_t.vlan_cfi", 1, false],
+        ["fabric_metadata_t.mpls_label", 20, false],
+        ["fabric_metadata_t.mpls_ttl", 8, false],
+        ["fabric_metadata_t.skip_forwarding", 1, false],
+        ["fabric_metadata_t.skip_next", 1, false],
         ["fabric_metadata_t.fwd_type", 3, false],
         ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.pop_vlan_when_packet_in", 1, false],
         ["fabric_metadata_t.is_multicast", 1, false],
         ["fabric_metadata_t.is_controller_packet_out", 1, false],
         ["fabric_metadata_t.clone_to_cpu", 1, false],
         ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_src_port", 16, false],
-        ["fabric_metadata_t.l4_dst_port", 16, false]
+        ["fabric_metadata_t.l4_sport", 16, false],
+        ["fabric_metadata_t.l4_dport", 16, false],
+        ["_padding_0", 7, false]
       ]
     },
     {
@@ -57,7 +62,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -67,7 +72,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -100,22 +105,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 6,
       "fields" : [
-        ["hw_type", 16, false],
-        ["proto_type", 16, false],
-        ["hw_addr_len", 8, false],
-        ["proto_addr_len", 8, false],
-        ["opcode", 16, false]
-      ]
-    },
-    {
-      "name" : "tcp_t",
-      "id" : 7,
-      "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["seq_no", 32, false],
         ["ack_no", 32, false],
         ["data_offset", 4, false],
@@ -129,17 +123,17 @@
     },
     {
       "name" : "udp_t",
-      "id" : 8,
+      "id" : 7,
       "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["len", 16, false],
         ["checksum", 16, false]
       ]
     },
     {
       "name" : "icmp_t",
-      "id" : 9,
+      "id" : 8,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -151,7 +145,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 10,
+      "id" : 9,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -159,7 +153,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -196,23 +190,23 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "inner_vlan_tag",
       "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 5,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 5,
-      "header_type" : "ipv4_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 6,
-      "header_type" : "arp_t",
+      "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -331,6 +325,32 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -348,12 +368,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -367,7 +381,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -388,12 +402,52 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -413,13 +467,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["inner_vlan_tag", "eth_type"]
             }
           ]
         },
         {
           "name" : "parse_mpls",
-          "id" : 4,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -434,7 +488,33 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -460,13 +540,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -489,6 +569,19 @@
                 }
               ],
               "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -524,29 +617,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 6,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 7,
           "parser_ops" : [
@@ -563,11 +633,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "src_port"]
+                  "value" : ["tcp", "sport"]
                 }
               ],
               "op" : "set"
@@ -576,11 +646,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "dst_port"]
+                  "value" : ["tcp", "dport"]
                 }
               ],
               "op" : "set"
@@ -612,11 +682,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "src_port"]
+                  "value" : ["udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -625,11 +695,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "dst_port"]
+                  "value" : ["udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -645,7 +715,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -682,11 +752,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "ipv4", "tcp", "udp", "icmp"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "ipv4", "tcp", "udp", "icmp"]
     }
   ],
   "meter_arrays" : [],
@@ -698,7 +768,7 @@
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 34,
+        "line" : 31,
         "column" : 50,
         "source_fragment" : "ingress_port_vlan_counter"
       }
@@ -710,7 +780,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -722,7 +792,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -734,7 +804,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -746,45 +816,45 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 80,
+        "line" : 82,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
     },
     {
-      "name" : "FabricIngress.forwarding.acl_counter",
+      "name" : "FabricIngress.acl.acl_counter",
       "id" : 5,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
+      "binding" : "FabricIngress.acl.acl",
       "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
         "column" : 50,
         "source_fragment" : "acl_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 6,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.vlan_meta",
+      "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 58,
+        "line" : 67,
         "column" : 50,
-        "source_fragment" : "vlan_meta_counter"
+        "source_fragment" : "next_vlan_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.simple_counter",
+      "name" : "FabricIngress.next.xconnect_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.simple",
+      "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 91,
         "column" : 50,
-        "source_fragment" : "simple_counter"
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
@@ -794,7 +864,7 @@
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
@@ -806,7 +876,7 @@
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
@@ -816,7 +886,7 @@
       "id" : 10,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -828,7 +898,7 @@
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -842,7 +912,7 @@
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -976,37 +1046,37 @@
   "learn_lists" : [],
   "actions" : [
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 0,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 1,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 2,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 3,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 4,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 5,
       "runtime_data" : [],
       "primitives" : []
@@ -1018,179 +1088,16 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.filtering.drop",
+      "name" : "FabricIngress.filtering.deny",
       "id" : 7,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 8,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 9,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "cfi"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "pri"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 52,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 99,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
+              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -1209,22 +1116,82 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
+            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 10,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 8,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 9,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 11,
+      "id" : 10,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -1246,7 +1213,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -1255,7 +1222,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 12,
+      "id" : 11,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1277,16 +1244,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 37,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 13,
+      "id" : 12,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1295,18 +1262,22 @@
       ],
       "primitives" : [
         {
-          "op" : "remove_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "mpls"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
             }
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 60,
+            "line" : 62,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
           }
         },
         {
@@ -1323,16 +1294,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 61,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 14,
+      "id" : 13,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1354,22 +1325,22 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 15,
+      "id" : 14,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
-      "id" : 16,
+      "name" : "FabricIngress.acl.set_next_id_acl",
+      "id" : 15,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1390,8 +1361,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 110,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -1399,8 +1370,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
-      "id" : 17,
+      "name" : "FabricIngress.acl.punt_to_cpu",
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1416,27 +1387,46 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 116,
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
         },
         {
-          "op" : "exit",
-          "parameters" : [],
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 118,
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
             "column" : 8,
-            "source_fragment" : "exit"
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.clone_to_cpu",
-      "id" : 18,
+      "name" : "FabricIngress.acl.clone_to_cpu",
+      "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1462,8 +1452,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 123,
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "fabric_metadata.clone_to_cpu = true"
           }
@@ -1471,64 +1461,93 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
-      "id" : 19,
+      "name" : "FabricIngress.acl.drop",
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 128,
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
+          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_acl",
-      "id" : 20,
+      "name" : "FabricIngress.acl.nop_acl",
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
+      "id" : 20,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 70,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_xconnect",
       "id" : 21,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 61,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_simple",
-      "id" : 22,
-      "runtime_data" : [
-        {
           "name" : "port_num",
           "bitwidth" : 9
         }
@@ -1548,69 +1567,77 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_vlan_output",
-      "id" : 23,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_simple",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 22,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
+      "id" : 23,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.routing_hashed",
       "id" : 24,
       "runtime_data" : [
         {
@@ -1641,7 +1668,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -1679,15 +1706,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_simple",
+      "name" : "FabricIngress.next.mpls_routing_hashed",
       "id" : 25,
       "runtime_data" : [
         {
@@ -1713,6 +1740,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -1722,7 +1768,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -1760,879 +1806,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v6_simple",
+      "name" : "FabricIngress.next.set_mcast_group_id",
       "id" : 26,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_vlan",
-      "id" : 27,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_hashed",
-      "id" : 28,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
-      "id" : 29,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 30,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 31,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -2651,9 +1837,9 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "standard_metadata.mcast_grp = gid"
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
         },
         {
@@ -2680,7 +1866,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -2689,7 +1875,7 @@
     },
     {
       "name" : "act",
-      "id" : 32,
+      "id" : 27,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2706,7 +1892,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 26,
+            "line" : 25,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
           }
@@ -2721,7 +1907,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -2750,7 +1936,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -2759,7 +1945,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 33,
+      "id" : 28,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2767,29 +1953,82 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 103,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+          }
         }
       ]
     },
     {
       "name" : "act_1",
-      "id" : 34,
+      "id" : 29,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2797,54 +2036,421 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x41"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 113,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_2",
+      "id" : 30,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp"]
             },
             {
               "type" : "expression",
               "value" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "b2d",
-                  "left" : null,
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_spec"]
+                  },
                   "right" : {
-                    "type" : "bool",
-                    "value" : false
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
                   }
                 }
               }
             }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_2",
-      "id" : 35,
-      "runtime_data" : [],
-      "primitives" : [
+          ],
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 38,
+            "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
+          }
+        },
         {
-          "op" : "assign",
+          "op" : "count",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "type" : "counter_array",
+              "value" : "FabricIngress.port_counters_control.egress_port_counter"
             },
             {
-              "type" : "hexstr",
-              "value" : "0x07"
+              "type" : "field",
+              "value" : ["scalars", "tmp"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 119,
-            "column" : 31,
-            "source_fragment" : "7; ..."
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
           }
         }
       ]
     },
     {
       "name" : "act_3",
+      "id" : 31,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_1"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 39,
+            "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.port_counters_control.ingress_port_counter"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_1"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "nop",
+      "id" : 32,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 33,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 246,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 248,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 34,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 253,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 255,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 256,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 257,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 35,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 266,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 267,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 269,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
       "id" : 36,
       "runtime_data" : [],
       "primitives" : [
@@ -2853,18 +2459,33 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             },
             {
-              "type" : "hexstr",
-              "value" : "0x0800"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 102,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
+            "filename" : "include/control/next.p4",
+            "line" : 280,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 281,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
         }
       ]
@@ -2875,27 +2496,14 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
         }
       ]
     },
@@ -2905,27 +2513,38 @@
       "runtime_data" : [],
       "primitives" : [
         {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "packet_in"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid()"
+          }
+        },
+        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
+              "value" : ["packet_in", "ingress_port"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "field",
+              "value" : ["standard_metadata", "ingress_port"]
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 50,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
+          }
         }
       ]
     },
@@ -2935,27 +2554,14 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
         }
       ]
     },
@@ -2969,7 +2575,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -2999,7 +2605,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -3025,27 +2631,14 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
         }
       ]
     },
@@ -3059,23 +2652,42 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
+              "value" : ["mpls", "ttl"]
             },
             {
               "type" : "expression",
               "value" : {
                 "type" : "expression",
                 "value" : {
-                  "op" : "b2d",
-                  "left" : null,
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
                   "right" : {
-                    "type" : "bool",
-                    "value" : false
+                    "type" : "hexstr",
+                    "value" : "0xff"
                   }
                 }
               }
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
         }
       ]
     },
@@ -3085,32 +2697,13 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
+          "op" : "drop",
+          "parameters" : [],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 223,
-            "column" : 20,
-            "source_fragment" : "return"
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
           }
         }
       ]
@@ -3157,311 +2750,12 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 230,
+            "line" : 323,
             "column" : 16,
             "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
           }
         }
       ]
-    },
-    {
-      "name" : "act_13",
-      "id" : 46,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "egress_spec"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/port_counter.p4",
-            "line" : 28,
-            "column" : 38,
-            "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
-          }
-        },
-        {
-          "op" : "count",
-          "parameters" : [
-            {
-              "type" : "counter_array",
-              "value" : "FabricIngress.port_counters_control.egress_port_counter"
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp_0"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/port_counter.p4",
-            "line" : 28,
-            "column" : 12,
-            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_14",
-      "id" : 47,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp_1"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "field",
-                    "value" : ["standard_metadata", "ingress_port"]
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xffffffff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/port_counter.p4",
-            "line" : 31,
-            "column" : 39,
-            "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
-          }
-        },
-        {
-          "op" : "count",
-          "parameters" : [
-            {
-              "type" : "counter_array",
-              "value" : "FabricIngress.port_counters_control.ingress_port_counter"
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp_1"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/port_counter.p4",
-            "line" : 31,
-            "column" : 12,
-            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "nop",
-      "id" : 48,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "drop_now",
-      "id" : 49,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "drop_now",
-      "id" : 50,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 51,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 40,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 52,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 253,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 254,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_15",
-      "id" : 53,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "packet_in"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 57,
-            "column" : 12,
-            "source_fragment" : "hdr.packet_in.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["packet_in", "ingress_port"]
-            },
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "ingress_port"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 58,
-            "column" : 12,
-            "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
-          }
-        }
-      ]
     }
   ],
   "pipelines" : [
@@ -3470,7 +2764,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -3486,14 +2780,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32],
+          "action_ids" : [27],
           "actions" : ["act"],
           "base_default_next" : null,
           "next_tables" : {
             "act" : null
           },
           "default_entry" : {
-            "action_id" : 32,
+            "action_id" : 27,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_0",
+          "id" : 1,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [28],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_6",
+          "next_tables" : {
+            "act_0" : "node_6"
+          },
+          "default_entry" : {
+            "action_id" : 28,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_1",
+          "id" : 2,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [29],
+          "actions" : ["act_1"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_1" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 29,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -3501,29 +2841,29 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 1,
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 66,
+            "line" : 51,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.is_valid",
+              "name" : "vlan_is_valid",
               "target" : ["vlan_tag", "$valid$"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             }
@@ -3534,61 +2874,16 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [9, 8, 7, 10],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
+          "action_ids" : [7, 8, 9],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
-            "__HIT__" : "tbl_act_0",
-            "__MISS__" : "tbl_act_1"
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 9,
-            "action_const" : true,
-            "action_data" : ["0xffe"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_0",
-          "id" : 2,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [33],
-          "actions" : ["act_0"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_0" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 33,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [34],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_1" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 7,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -3599,27 +2894,27 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 103,
+            "line" : 86,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             }
           ],
@@ -3629,61 +2924,38 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11],
+          "action_ids" : [10],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 11,
+            "action_id" : 10,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_2",
-          "id" : 5,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [35],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_10",
-          "next_tables" : {
-            "act_2" : "node_10"
-          },
-          "default_entry" : {
-            "action_id" : 35,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 6,
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 10,
             "source_fragment" : "bridging"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -3694,34 +2966,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12, 0],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [11, 0],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 0,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 7,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "mpls"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.mpls.label",
-              "target" : ["mpls", "label"],
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
               "mask" : null
             }
           ],
@@ -3731,38 +3003,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 1],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_3",
+          "action_ids" : [12, 1],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_3",
-            "NoAction" : "tbl_act_3"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 1,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_3",
-          "id" : 8,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [36],
-          "actions" : ["act_3"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_3" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 36,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -3770,17 +3019,17 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 9,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 91,
+            "line" : 93,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -3791,100 +3040,100 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 15, 2],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [13, 14, 2],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
-            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 10,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 8,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 136,
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
             "column" : 10,
             "source_fragment" : "acl"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.ip_proto",
+              "name" : "ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_src",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.src_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_type",
+              "name" : "icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_code",
+              "name" : "icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -3895,26 +3144,178 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 17, 18, 19, 20],
-          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_4",
+          "action_ids" : [15, 16, 17, 18, 19],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_18",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_4",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_4",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_4",
-            "FabricIngress.forwarding.drop" : "tbl_act_4",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_4"
+            "FabricIngress.acl.set_next_id_acl" : "node_18",
+            "FabricIngress.acl.punt_to_cpu" : "node_18",
+            "FabricIngress.acl.clone_to_cpu" : "node_18",
+            "FabricIngress.acl.drop" : "node_18",
+            "FabricIngress.acl.nop_acl" : "node_18"
           },
           "default_entry" : {
-            "action_id" : 20,
+            "action_id" : 19,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_4",
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [21, 22, 4],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.hashed",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 4,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 10,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 180,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [23, 24, 25, 5],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
           "id" : 11,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [26, 6],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 6,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 12,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [20, 3],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_23",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_23",
+            "nop" : "node_23"
+          },
+          "default_entry" : {
+            "action_id" : 3,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3922,95 +3323,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37],
-          "actions" : ["act_4"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [30],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_25",
           "next_tables" : {
-            "act_4" : "FabricIngress.next.vlan_meta"
+            "act_2" : "node_25"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 30,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 65,
-            "column" : 10,
-            "source_fragment" : "vlan_meta"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [21, 6],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "FabricIngress.next.simple",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "FabricIngress.next.simple",
-            "nop" : "FabricIngress.next.simple"
-          },
-          "default_entry" : {
-            "action_id" : 6,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.next.simple",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 122,
-            "column" : 10,
-            "source_fragment" : "simple"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [22, 23, 24, 25, 26, 27, 3],
-          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_5",
-            "__MISS__" : "tbl_act_6"
-          },
-          "default_entry" : {
-            "action_id" : 3,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_3",
           "id" : 14,
           "key" : [],
           "match_type" : "exact",
@@ -4019,290 +3346,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_23",
-          "next_tables" : {
-            "act_5" : "node_23"
-          },
-          "default_entry" : {
-            "action_id" : 38,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_6",
-          "id" : 15,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_23",
-          "next_tables" : {
-            "act_6" : "node_23"
-          },
-          "default_entry" : {
-            "action_id" : 39,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 175,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "FabricIngress.next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [28, 29, 30, 4],
-          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
+          "action_ids" : [31],
+          "actions" : ["act_3"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_7",
-            "__MISS__" : "tbl_act_8"
-          }
-        },
-        {
-          "name" : "tbl_act_7",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_7"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_7" : "node_27"
+            "act_3" : null
           },
           "default_entry" : {
-            "action_id" : 40,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 18,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_8" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 41,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 207,
-            "column" : 10,
-            "source_fragment" : "multicast"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [31, 5],
-          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
-          },
-          "default_entry" : {
-            "action_id" : 5,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 20,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_31",
-          "next_tables" : {
-            "act_9" : "node_31"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 21,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_31",
-          "next_tables" : {
-            "act_10" : "node_31"
-          },
-          "default_entry" : {
-            "action_id" : 43,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 22,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_33",
-          "next_tables" : {
-            "act_11" : "node_33"
-          },
-          "default_entry" : {
-            "action_id" : 44,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_12",
-          "id" : 23,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_37",
-          "next_tables" : {
-            "act_12" : "node_37"
-          },
-          "default_entry" : {
-            "action_id" : 45,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
-          "id" : 24,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_39",
-          "next_tables" : {
-            "act_13" : "node_39"
-          },
-          "default_entry" : {
-            "action_id" : 46,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_14",
-          "id" : 25,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_14"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "act_14" : null
-          },
-          "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 31,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4311,13 +3362,13 @@
       ],
       "action_profiles" : [
         {
-          "name" : "FabricIngress.next.ecmp_selector",
+          "name" : "FabricIngress.next.hashed_selector",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 145,
+            "line" : 161,
             "column" : 55,
-            "source_fragment" : "ecmp_selector"
+            "source_fragment" : "hashed_selector"
           },
           "max_size" : 64,
           "selector" : {
@@ -4337,11 +3388,11 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
               }
             ]
           }
@@ -4353,7 +3404,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -4369,11 +3420,17 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+          "false_next" : "node_4"
         },
         {
-          "name" : "node_7",
+          "name" : "node_4",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 102,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -4381,20 +3438,83 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "filtering_tmp_0"]
+                "value" : ["vlan_tag", "$valid$"]
               }
             }
           },
-          "true_next" : "FabricIngress.filtering.fwd_classifier",
-          "false_next" : "tbl_act_2"
+          "true_next" : "tbl_act_0",
+          "false_next" : "node_6"
+        },
+        {
+          "name" : "node_6",
+          "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_1",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
           "name" : "node_10",
-          "id" : 2,
+          "id" : 3,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_11",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_11",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 191,
-            "column" : 11,
+            "line" : 131,
+            "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
           "expression" : {
@@ -4412,14 +3532,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_12"
+          "false_next" : "node_13"
         },
         {
-          "name" : "node_12",
-          "id" : 3,
+          "name" : "node_13",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 192,
+            "line" : 132,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -4442,10 +3562,10 @@
         },
         {
           "name" : "node_15",
-          "id" : 4,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 198,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -4464,181 +3584,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_18",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 70,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
           "name" : "node_23",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 219,
-            "column" : 12,
-            "source_fragment" : "!simple.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_4"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_27",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 220,
-            "column" : 16,
-            "source_fragment" : "!hashed.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_3"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_31",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 221,
-            "column" : 20,
-            "source_fragment" : "!multicast.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_2"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_11",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_33",
           "id" : 8,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_hasReturned_0"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_34",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_34",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
-            "column" : 12,
-            "source_fragment" : "!hdr.mpls.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["mpls", "$valid$"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_35",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_35",
-          "id" : 10,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 229,
-            "column" : 15,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_12",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_37",
-          "id" : 11,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -4656,15 +3642,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_39"
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_25"
         },
         {
-          "name" : "node_39",
-          "id" : 12,
+          "name" : "node_25",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -4683,7 +3669,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_14"
+          "true_next" : "tbl_act_3"
         }
       ]
     },
@@ -4692,15 +3678,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_43",
+      "init_table" : "node_29",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 26,
+          "name" : "tbl_act_4",
+          "id" : 15,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4708,22 +3694,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_47",
+          "action_ids" : [37],
+          "actions" : ["act_4"],
+          "base_default_next" : "tbl_act_5",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_47"
+            "act_4" : "tbl_act_5"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 37,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 27,
+          "name" : "tbl_act_5",
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4731,45 +3717,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_15",
-          "next_tables" : {
-            "drop_now" : "tbl_act_15"
-          },
-          "default_entry" : {
-            "action_id" : 49,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_15",
-          "id" : 28,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_15"],
+          "action_ids" : [38],
+          "actions" : ["act_5"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "act_5" : null
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 38,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 29,
+          "name" : "tbl_act_6",
+          "id" : 17,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4777,14 +3740,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [39],
+          "actions" : ["act_6"],
+          "base_default_next" : "node_36",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_6" : "node_36"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 39,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 18,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [33],
+          "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" : 33,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 19,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [34],
+          "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" : 34,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4792,23 +3801,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 30,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 258,
+            "line" : 285,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_port",
+              "name" : "eg_port",
               "target" : ["standard_metadata", "egress_port"],
               "mask" : null
             }
@@ -4819,29 +3828,190 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52, 48],
+          "action_ids" : [36, 32],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : null,
-            "nop" : null
+            "__HIT__" : "tbl_act_7",
+            "__MISS__" : "tbl_act_8"
           },
           "default_entry" : {
-            "action_id" : 48,
-            "action_const" : false,
+            "action_id" : 32,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 21,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [40],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_43",
+          "next_tables" : {
+            "act_7" : "node_43"
+          },
+          "default_entry" : {
+            "action_id" : 40,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_8",
+          "id" : 22,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [41],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_43",
+          "next_tables" : {
+            "act_8" : "node_43"
+          },
+          "default_entry" : {
+            "action_id" : 41,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 23,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [35],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_46",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_46"
+          },
+          "default_entry" : {
+            "action_id" : 35,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_9",
+          "id" : 24,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [43],
+          "actions" : ["act_10"],
+          "base_default_next" : "node_48",
+          "next_tables" : {
+            "act_10" : "node_48"
+          },
+          "default_entry" : {
+            "action_id" : 43,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_10",
+          "id" : 25,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [42],
+          "actions" : ["act_9"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "act_9" : null
+          },
+          "default_entry" : {
+            "action_id" : 42,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_11",
+          "id" : 26,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [45],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_52",
+          "next_tables" : {
+            "act_12" : "node_52"
+          },
+          "default_entry" : {
+            "action_id" : 45,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_12",
+          "id" : 27,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [44],
+          "actions" : ["act_11"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "act_11" : null
+          },
+          "default_entry" : {
+            "action_id" : 44,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
           }
         }
       ],
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_43",
-          "id" : 13,
+          "name" : "node_29",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -4867,14 +4037,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_44"
+          "false_next" : "node_30"
         },
         {
-          "name" : "node_44",
-          "id" : 14,
+          "name" : "node_30",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -4892,65 +4062,15 @@
               }
             }
           },
-          "true_next" : "node_45",
-          "false_next" : "node_50"
+          "true_next" : "node_31",
+          "false_next" : "node_34"
         },
         {
-          "name" : "node_45",
-          "id" : 15,
+          "name" : "node_31",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["vlan_tag", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_47"
-        },
-        {
-          "name" : "node_47",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -5002,15 +4122,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now",
-          "false_next" : "tbl_act_15"
+          "true_next" : "tbl_act_4",
+          "false_next" : "tbl_act_5"
         },
         {
-          "name" : "node_50",
-          "id" : 17,
+          "name" : "node_34",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -5055,8 +4175,211 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
+          "true_next" : "tbl_act_6",
+          "false_next" : "node_36"
+        },
+        {
+          "name" : "node_36",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 304,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_37",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_37",
+          "id" : 15,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 305,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
           "false_next" : "FabricEgress.egress_next.egress_vlan"
+        },
+        {
+          "name" : "node_43",
+          "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_44",
+          "false_next" : "node_46"
+        },
+        {
+          "name" : "node_44",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_46"
+        },
+        {
+          "name" : "node_46",
+          "id" : 18,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 318,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_9",
+          "false_next" : "node_50"
+        },
+        {
+          "name" : "node_48",
+          "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "tbl_act_10"
+        },
+        {
+          "name" : "node_50",
+          "id" : 20,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 322,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "tbl_act_11"
+        },
+        {
+          "name" : "node_52",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "tbl_act_12"
         }
       ]
     }
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index ef6a5b5..b91f305 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -6,38 +6,34 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.vlan_tag.is_valid"
+    name: "vlan_is_valid"
     bitwidth: 1
     match_type: EXACT
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   action_refs {
-    id: 16835546
+    id: 16836487
   }
   action_refs {
-    id: 16793253
+    id: 16818236
   }
   action_refs {
-    id: 16798734
+    id: 16794911
   }
-  action_refs {
-    id: 16833700
-  }
-  const_default_action_id: 16835546
+  const_default_action_id: 16836487
   direct_resource_ids: 318815501
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -47,19 +43,19 @@
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: EXACT
   }
@@ -69,7 +65,6 @@
   const_default_action_id: 16840921
   direct_resource_ids: 318827326
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -79,13 +74,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
@@ -93,12 +88,12 @@
     id: 16811012
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318770289
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -108,7 +103,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.mpls.label"
+    name: "mpls_label"
     bitwidth: 20
     match_type: EXACT
   }
@@ -116,12 +111,12 @@
     id: 16827758
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318830507
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -131,7 +126,7 @@
   }
   match_fields {
     id: 1
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: LPM
   }
@@ -142,120 +137,119 @@
     id: 16804187
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318811107
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33574876
-    name: "FabricIngress.forwarding.acl"
+    id: 33618978
+    name: "FabricIngress.acl.acl"
     alias: "acl"
   }
   match_fields {
     id: 1
-    name: "standard_metadata.ingress_port"
+    name: "ig_port"
     bitwidth: 9
     match_type: TERNARY
   }
   match_fields {
     id: 2
-    name: "fabric_metadata.ip_proto"
+    name: "ip_proto"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 3
-    name: "fabric_metadata.l4_src_port"
+    name: "l4_sport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 4
-    name: "fabric_metadata.l4_dst_port"
+    name: "l4_dport"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 5
-    name: "hdr.ethernet.dst_addr"
+    name: "eth_src"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 6
-    name: "hdr.ethernet.src_addr"
+    name: "eth_dst"
     bitwidth: 48
     match_type: TERNARY
   }
   match_fields {
     id: 7
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: TERNARY
   }
   match_fields {
     id: 8
-    name: "hdr.vlan_tag.ether_type"
+    name: "eth_type"
     bitwidth: 16
     match_type: TERNARY
   }
   match_fields {
     id: 9
-    name: "hdr.ipv4.src_addr"
+    name: "ipv4_src"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 10
-    name: "hdr.ipv4.dst_addr"
+    name: "ipv4_dst"
     bitwidth: 32
     match_type: TERNARY
   }
   match_fields {
     id: 11
-    name: "hdr.icmp.icmp_type"
+    name: "icmp_type"
     bitwidth: 8
     match_type: TERNARY
   }
   match_fields {
     id: 12
-    name: "hdr.icmp.icmp_code"
+    name: "icmp_code"
     bitwidth: 8
     match_type: TERNARY
   }
   action_refs {
-    id: 16785374
+    id: 16807382
   }
   action_refs {
-    id: 16801806
+    id: 16829684
   }
   action_refs {
-    id: 16784835
+    id: 16790975
   }
   action_refs {
-    id: 16833260
+    id: 16820765
   }
   action_refs {
-    id: 16842570
+    id: 16827694
   }
-  const_default_action_id: 16842570
-  direct_resource_ids: 318772272
+  const_default_action_id: 16827694
+  direct_resource_ids: 318801025
   size: 128
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33562709
-    name: "FabricIngress.next.vlan_meta"
-    alias: "vlan_meta"
+    id: 33599709
+    name: "FabricIngress.next.next_vlan"
+    alias: "next_vlan"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
@@ -266,47 +260,41 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318785328
+  const_default_action_id: 16819938
+  direct_resource_ids: 318768144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
-    id: 33571723
-    name: "FabricIngress.next.simple"
-    alias: "simple"
+    id: 33596977
+    name: "FabricIngress.next.xconnect"
+    alias: "xconnect"
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16802668
+    id: 16842190
   }
   action_refs {
-    id: 16808391
+    id: 16837052
   }
   action_refs {
-    id: 16780007
-  }
-  action_refs {
-    id: 16806134
-  }
-  action_refs {
-    id: 16795970
-  }
-  action_refs {
-    id: 16791579
-  }
-  action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318769096
+  const_default_action_id: 16819938
+  direct_resource_ids: 318778156
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -316,27 +304,27 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16800211
+    id: 16815357
   }
   action_refs {
-    id: 16779239
+    id: 16791402
   }
   action_refs {
-    id: 16819349
+    id: 16779255
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
-  implementation_id: 285233747
+  const_default_action_id: 16819938
+  implementation_id: 285217164
   direct_resource_ids: 318800532
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -346,20 +334,20 @@
   }
   match_fields {
     id: 1
-    name: "fabric_metadata.next_id"
+    name: "next_id"
     bitwidth: 32
     match_type: EXACT
   }
   action_refs {
-    id: 16789575
+    id: 16779917
   }
   action_refs {
-    id: 16800567
+    id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318801752
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
 }
 tables {
   preamble {
@@ -369,13 +357,13 @@
   }
   match_fields {
     id: 1
-    name: "hdr.vlan_tag.vlan_id"
+    name: "vlan_id"
     bitwidth: 12
     match_type: EXACT
   }
   match_fields {
     id: 2
-    name: "standard_metadata.egress_port"
+    name: "eg_port"
     bitwidth: 9
     match_type: EXACT
   }
@@ -386,16 +374,9 @@
     id: 16819938
     annotations: "@defaultonly()"
   }
+  const_default_action_id: 16819938
   direct_resource_ids: 318827144
   size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-actions {
-  preamble {
-    id: 16800567
-    name: "NoAction"
-    alias: "NoAction"
-  }
 }
 actions {
   preamble {
@@ -406,44 +387,32 @@
 }
 actions {
   preamble {
-    id: 16798734
-    name: "FabricIngress.filtering.drop"
-    alias: "filtering.drop"
+    id: 16836487
+    name: "FabricIngress.filtering.deny"
+    alias: "deny"
   }
 }
 actions {
   preamble {
-    id: 16793253
-    name: "FabricIngress.filtering.set_vlan"
-    alias: "filtering.set_vlan"
+    id: 16818236
+    name: "FabricIngress.filtering.permit"
+    alias: "permit"
+  }
+}
+actions {
+  preamble {
+    id: 16794911
+    name: "FabricIngress.filtering.permit_with_internal_vlan"
+    alias: "permit_with_internal_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16835546
-    name: "FabricIngress.filtering.push_internal_vlan"
-    alias: "push_internal_vlan"
-  }
-  params {
-    id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16833700
-    name: "FabricIngress.filtering.nop_ingress_port_vlan"
-    alias: "nop_ingress_port_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16840921
     name: "FabricIngress.filtering.set_forwarding_type"
     alias: "set_forwarding_type"
@@ -499,8 +468,8 @@
 }
 actions {
   preamble {
-    id: 16785374
-    name: "FabricIngress.forwarding.set_next_id_acl"
+    id: 16807382
+    name: "FabricIngress.acl.set_next_id_acl"
     alias: "set_next_id_acl"
   }
   params {
@@ -511,29 +480,29 @@
 }
 actions {
   preamble {
-    id: 16801806
-    name: "FabricIngress.forwarding.punt_to_cpu"
+    id: 16829684
+    name: "FabricIngress.acl.punt_to_cpu"
     alias: "punt_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16784835
-    name: "FabricIngress.forwarding.clone_to_cpu"
+    id: 16790975
+    name: "FabricIngress.acl.clone_to_cpu"
     alias: "clone_to_cpu"
   }
 }
 actions {
   preamble {
-    id: 16833260
-    name: "FabricIngress.forwarding.drop"
-    alias: "forwarding.drop"
+    id: 16820765
+    name: "FabricIngress.acl.drop"
+    alias: "drop"
   }
 }
 actions {
   preamble {
-    id: 16842570
-    name: "FabricIngress.forwarding.nop_acl"
+    id: 16827694
+    name: "FabricIngress.acl.nop_acl"
     alias: "nop_acl"
   }
 }
@@ -541,19 +510,19 @@
   preamble {
     id: 16790685
     name: "FabricIngress.next.set_vlan"
-    alias: "next.set_vlan"
+    alias: "set_vlan"
   }
   params {
     id: 1
-    name: "new_vlan_id"
+    name: "vlan_id"
     bitwidth: 12
   }
 }
 actions {
   preamble {
-    id: 16802668
-    name: "FabricIngress.next.output_simple"
-    alias: "output_simple"
+    id: 16842190
+    name: "FabricIngress.next.output_xconnect"
+    alias: "output_xconnect"
   }
   params {
     id: 1
@@ -563,26 +532,33 @@
 }
 actions {
   preamble {
-    id: 16808391
-    name: "FabricIngress.next.set_vlan_output"
-    alias: "set_vlan_output"
+    id: 16837052
+    name: "FabricIngress.next.set_next_id_xconnect"
+    alias: "set_next_id_xconnect"
   }
   params {
     id: 1
-    name: "new_vlan_id"
-    bitwidth: 12
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16815357
+    name: "FabricIngress.next.output_hashed"
+    alias: "output_hashed"
   }
   params {
-    id: 2
+    id: 1
     name: "port_num"
     bitwidth: 9
   }
 }
 actions {
   preamble {
-    id: 16780007
-    name: "FabricIngress.next.l3_routing_simple"
-    alias: "l3_routing_simple"
+    id: 16791402
+    name: "FabricIngress.next.routing_hashed"
+    alias: "routing_hashed"
   }
   params {
     id: 1
@@ -602,9 +578,9 @@
 }
 actions {
   preamble {
-    id: 16806134
-    name: "FabricIngress.next.mpls_routing_v4_simple"
-    alias: "mpls_routing_v4_simple"
+    id: 16779255
+    name: "FabricIngress.next.mpls_routing_hashed"
+    alias: "mpls_routing_hashed"
   }
   params {
     id: 1
@@ -629,172 +605,28 @@
 }
 actions {
   preamble {
-    id: 16795970
-    name: "FabricIngress.next.mpls_routing_v6_simple"
-    alias: "mpls_routing_v6_simple"
+    id: 16779917
+    name: "FabricIngress.next.set_mcast_group_id"
+    alias: "set_mcast_group_id"
   }
   params {
     id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16791579
-    name: "FabricIngress.next.l3_routing_vlan"
-    alias: "l3_routing_vlan"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "new_vlan_id"
-    bitwidth: 12
-  }
-}
-actions {
-  preamble {
-    id: 16800211
-    name: "FabricIngress.next.l3_routing_hashed"
-    alias: "l3_routing_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-}
-actions {
-  preamble {
-    id: 16779239
-    name: "FabricIngress.next.mpls_routing_v4_hashed"
-    alias: "mpls_routing_v4_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16819349
-    name: "FabricIngress.next.mpls_routing_v6_hashed"
-    alias: "mpls_routing_v6_hashed"
-  }
-  params {
-    id: 1
-    name: "port_num"
-    bitwidth: 9
-  }
-  params {
-    id: 2
-    name: "smac"
-    bitwidth: 48
-  }
-  params {
-    id: 3
-    name: "dmac"
-    bitwidth: 48
-  }
-  params {
-    id: 4
-    name: "label"
-    bitwidth: 20
-  }
-}
-actions {
-  preamble {
-    id: 16789575
-    name: "FabricIngress.next.set_mcast_group"
-    alias: "set_mcast_group"
-  }
-  params {
-    id: 1
-    name: "gid"
+    name: "group_id"
     bitwidth: 16
   }
 }
 actions {
   preamble {
-    id: 16823970
-    name: "drop_now"
-    alias: "drop_now"
-  }
-}
-actions {
-  preamble {
-    id: 16801047
-    name: "FabricEgress.pkt_io_egress.pop_vlan"
-    alias: "pkt_io_egress.pop_vlan"
-  }
-}
-actions {
-  preamble {
     id: 16790030
     name: "FabricEgress.egress_next.pop_vlan"
-    alias: "egress_next.pop_vlan"
+    alias: "pop_vlan"
   }
 }
 action_profiles {
   preamble {
-    id: 285233747
-    name: "FabricIngress.next.ecmp_selector"
-    alias: "ecmp_selector"
+    id: 285217164
+    name: "FabricIngress.next.hashed_selector"
+    alias: "hashed_selector"
   }
   table_ids: 33608588
   with_selector: true
@@ -879,36 +711,36 @@
 }
 direct_counters {
   preamble {
-    id: 318772272
-    name: "FabricIngress.forwarding.acl_counter"
+    id: 318801025
+    name: "FabricIngress.acl.acl_counter"
     alias: "acl_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33574876
+  direct_table_id: 33618978
 }
 direct_counters {
   preamble {
-    id: 318785328
-    name: "FabricIngress.next.vlan_meta_counter"
-    alias: "vlan_meta_counter"
+    id: 318768144
+    name: "FabricIngress.next.next_vlan_counter"
+    alias: "next_vlan_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33562709
+  direct_table_id: 33599709
 }
 direct_counters {
   preamble {
-    id: 318769096
-    name: "FabricIngress.next.simple_counter"
-    alias: "simple_counter"
+    id: 318778156
+    name: "FabricIngress.next.xconnect_counter"
+    alias: "xconnect_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33571723
+  direct_table_id: 33596977
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
index a629718..217a736 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
@@ -54,17 +54,17 @@
      * Map treatment to push_internal_vlan action.
      */
     @Test
-    public void testFilteringTreatment1() throws Exception {
+    public void testFilteringTreatmentPermitWithInternalVlan() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .pushVlan()
                 .setVlanId(VLAN_100)
                 .build();
         PiAction mappedAction = interpreter.mapTreatment(treatment,
                                                    FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
-        PiActionParam param = new PiActionParam(FabricConstants.NEW_VLAN_ID,
+        PiActionParam param = new PiActionParam(FabricConstants.VLAN_ID,
                                                 ImmutableByteSequence.copyFrom(VLAN_100.toShort()));
         PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_PUSH_INTERNAL_VLAN)
+                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN)
                 .withParameter(param)
                 .build();
 
@@ -72,35 +72,15 @@
     }
 
     /**
-     * Map treatment to set_vlan action.
+     * Map treatment to permit action.
      */
     @Test
-    public void testFilteringTreatment2() throws Exception {
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setVlanId(VLAN_100)
-                .build();
-        PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
-        PiActionParam param = new PiActionParam(FabricConstants.NEW_VLAN_ID,
-                                                ImmutableByteSequence.copyFrom(VLAN_100.toShort()));
-        PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_SET_VLAN)
-                .withParameter(param)
-                .build();
-
-        assertEquals(expectedAction, mappedAction);
-    }
-
-    /**
-     * Map treatment to nop action.
-     */
-    @Test
-    public void testFilteringTreatment3() throws Exception {
+    public void testFilteringTreatmentPermit() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.emptyTreatment();
         PiAction mappedAction = interpreter.mapTreatment(treatment,
                                                          FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
         PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_NOP_INGRESS_PORT_VLAN)
+                .withId(FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT)
                 .build();
 
         assertEquals(expectedAction, mappedAction);
@@ -112,37 +92,43 @@
      * Map treatment to duplicate_to_controller action.
      */
     @Test
-    public void testForwardingTreatment1() throws Exception {
+    public void testAclTreatmentCloneToCpu() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .punt()
                 .build();
         PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_FORWARDING_ACL);
+                                                         FabricConstants.FABRIC_INGRESS_ACL_ACL);
         PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_CLONE_TO_CPU)
+                .withId(FabricConstants.FABRIC_INGRESS_ACL_CLONE_TO_CPU)
                 .build();
 
         assertEquals(expectedAction, mappedAction);
     }
 
     /**
-     * Map empty treatment for forwarding block to nop action.
+     * Map empty treatment for routing v4 table.
      */
     @Test
-    public void testEmptyForwardingTreatment() throws Exception {
+    public void testRoutingV4TreatmentEmpty() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.emptyTreatment();
-
-        PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4);
+        PiAction mappedAction = interpreter.mapTreatment(
+                treatment, FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4);
         PiAction expectedAction = PiAction.builder()
                 .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ROUTING_V4)
                 .build();
         assertEquals(expectedAction, mappedAction);
+    }
 
-        mappedAction = interpreter.mapTreatment(treatment,
-                                                FabricConstants.FABRIC_INGRESS_FORWARDING_ACL);
-        expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ACL)
+    /**
+     * Map empty treatment for ACL table.
+     */
+    @Test
+    public void testAclTreatmentEmpty() throws Exception {
+        TrafficTreatment treatment = DefaultTrafficTreatment.emptyTreatment();
+        PiAction mappedAction = interpreter.mapTreatment(
+                treatment, FabricConstants.FABRIC_INGRESS_ACL_ACL);
+        PiAction expectedAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_ACL_NOP_ACL)
                 .build();
         assertEquals(expectedAction, mappedAction);
     }
@@ -153,47 +139,64 @@
      * Map treatment to output action.
      */
     @Test
-    public void testNextTreatment1() throws Exception {
+    public void testNextTreatmentSimpleOutput() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .setOutput(PORT_1)
                 .build();
-        PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE);
-        short portNumVal = (short) PORT_1.toLong();
-        PiActionParam param = new PiActionParam(FabricConstants.PORT_NUM,
-                                                ImmutableByteSequence.copyFrom(portNumVal));
+        PiAction mappedAction = interpreter.mapTreatment(
+                treatment, FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE);
+        PiActionParam param = new PiActionParam(FabricConstants.PORT_NUM, PORT_1.toLong());
         PiAction expectedAction = PiAction.builder()
                 .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE)
                 .withParameter(param)
                 .build();
-
         assertEquals(expectedAction, mappedAction);
     }
 
     /**
-     * Map treatment to output_ecmp action.
+     * Map treatment for hashed table to routing v4 action.
      */
     @Test
-    public void testNextTreatment2() throws Exception {
+    public void testNextTreatmentHashedRoutingV4() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .setEthSrc(SRC_MAC)
                 .setEthDst(DST_MAC)
                 .setOutput(PORT_1)
                 .build();
-        PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_NEXT_HASHED);
-        short portNumVal = (short) PORT_1.toLong();
-        PiActionParam ethSrcParam = new PiActionParam(FabricConstants.SMAC,
-                                                      ImmutableByteSequence.copyFrom(SRC_MAC.toBytes()));
-        PiActionParam ethDstParam = new PiActionParam(FabricConstants.DMAC,
-                                                      ImmutableByteSequence.copyFrom(DST_MAC.toBytes()));
-        PiActionParam portParam = new PiActionParam(FabricConstants.PORT_NUM,
-                                                ImmutableByteSequence.copyFrom(portNumVal));
+        PiAction mappedAction = interpreter.mapTreatment(
+                treatment, FabricConstants.FABRIC_INGRESS_NEXT_HASHED);
+        PiActionParam ethSrcParam = new PiActionParam(FabricConstants.SMAC, SRC_MAC.toBytes());
+        PiActionParam ethDstParam = new PiActionParam(FabricConstants.DMAC, DST_MAC.toBytes());
+        PiActionParam portParam = new PiActionParam(FabricConstants.PORT_NUM, PORT_1.toLong());
         PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING_HASHED)
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_ROUTING_HASHED)
                 .withParameters(ImmutableList.of(ethSrcParam, ethDstParam, portParam))
                 .build();
+        assertEquals(expectedAction, mappedAction);
+    }
 
+    /**
+     * Map treatment for hashed table to routing v4 action.
+     */
+    @Test
+    public void testNextTreatmentHashedRoutingMpls() throws Exception {
+        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .setEthSrc(SRC_MAC)
+                .setEthDst(DST_MAC)
+                .setOutput(PORT_1)
+                .pushMpls()
+                .setMpls(MPLS_10)
+                .build();
+        PiAction mappedAction = interpreter.mapTreatment(
+                treatment, FabricConstants.FABRIC_INGRESS_NEXT_HASHED);
+        PiActionParam ethSrcParam = new PiActionParam(FabricConstants.SMAC, SRC_MAC.toBytes());
+        PiActionParam ethDstParam = new PiActionParam(FabricConstants.DMAC, DST_MAC.toBytes());
+        PiActionParam portParam = new PiActionParam(FabricConstants.PORT_NUM, PORT_1.toLong());
+        PiActionParam mplsParam = new PiActionParam(FabricConstants.LABEL, MPLS_10.toInt());
+        PiAction expectedAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_HASHED)
+                .withParameters(ImmutableList.of(ethSrcParam, ethDstParam, portParam, mplsParam))
+                .build();
         assertEquals(expectedAction, mappedAction);
     }
 
@@ -204,50 +207,14 @@
     public void testNextTreatment3() throws Exception {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .setVlanId(VLAN_100)
-                .setOutput(PORT_1)
                 .build();
-        PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE);
-        short portNumVal = (short) PORT_1.toLong();
-        PiActionParam portParam = new PiActionParam(FabricConstants.PORT_NUM,
-                                                    ImmutableByteSequence.copyFrom(portNumVal));
-        short vlanVal = VLAN_100.toShort();
-        PiActionParam vlanParam = new PiActionParam(FabricConstants.NEW_VLAN_ID,
-                                                    ImmutableByteSequence.copyFrom(vlanVal));
-
+        PiAction mappedAction = interpreter.mapTreatment(
+                treatment, FabricConstants.FABRIC_INGRESS_NEXT_NEXT_VLAN);
+        PiActionParam vlanParam = new PiActionParam(
+                FabricConstants.VLAN_ID, VLAN_100.toShort());
         PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT)
-                .withParameters(ImmutableList.of(vlanParam, portParam))
-                .build();
-
-        assertEquals(expectedAction, mappedAction);
-    }
-
-    @Test
-    public void testMplsRoutingTreatment() throws Exception {
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setEthDst(DST_MAC)
-                .setEthSrc(SRC_MAC)
-                .pushMpls()
-                .copyTtlOut()
-                .setMpls(MPLS_10)
-                .setOutput(PORT_1)
-                .build();
-        PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_NEXT_HASHED);
-        short portNumVal = (short) PORT_1.toLong();
-        PiActionParam ethSrcParam = new PiActionParam(FabricConstants.SMAC,
-                                                      ImmutableByteSequence.copyFrom(SRC_MAC.toBytes()));
-        PiActionParam ethDstParam = new PiActionParam(FabricConstants.DMAC,
-                                                      ImmutableByteSequence.copyFrom(DST_MAC.toBytes()));
-        PiActionParam portParam = new PiActionParam(FabricConstants.PORT_NUM,
-                                                    ImmutableByteSequence.copyFrom(portNumVal));
-        ImmutableByteSequence mplsVal =
-                ImmutableByteSequence.copyFrom(MPLS_10.toInt()).fit(20);
-        PiActionParam mplsParam = new PiActionParam(FabricConstants.LABEL, mplsVal);
-        PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED)
-                .withParameters(ImmutableList.of(ethSrcParam, ethDstParam, portParam, mplsParam))
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN)
+                .withParameter(vlanParam)
                 .build();
         assertEquals(expectedAction, mappedAction);
     }
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
index 9ceb869..3bdab99 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
@@ -16,6 +16,7 @@
 
 package org.onosproject.pipelines.fabric.pipeliner;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.MacAddress;
@@ -33,71 +34,71 @@
 import org.onosproject.net.flowobjective.DefaultFilteringObjective;
 import org.onosproject.net.flowobjective.FilteringObjective;
 import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.net.group.GroupDescription;
 import org.onosproject.net.pi.runtime.PiAction;
 import org.onosproject.net.pi.runtime.PiActionParam;
 import org.onosproject.pipelines.fabric.FabricConstants;
 
-import java.util.List;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for fabric.p4 pipeline filtering control block.
  */
 public class FabricFilteringPipelinerTest extends FabricPipelinerTest {
 
+    private FilteringObjectiveTranslator translator;
+
+    @Before
+    public void setup() {
+        super.doSetup();
+        translator = new FilteringObjectiveTranslator(DEVICE_ID, capabilitiesHashed);
+    }
+
     /**
      * Creates one rule for ingress_port_vlan table and 3 rules for
      * fwd_classifier table (IPv4, IPv6 and MPLS unicast) when
      * the condition is VLAN + MAC.
      */
     @Test
-    public void testRouterMacAndVlanFilter() {
+    public void testRouterMacAndVlanFilter() throws FabricPipelinerException {
         FilteringObjective filteringObjective = buildFilteringObjective(ROUTER_MAC);
-        PipelinerTranslationResult result = pipeliner.pipelinerFilter.filter(filteringObjective);
-
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-
-        assertTrue(groupsInstalled.isEmpty());
+        ObjectiveTranslation actualTranslation = translator.translate(filteringObjective);
 
         // in port vlan flow rule
-        FlowRule actualFlowRule = flowRulesInstalled.get(0);
-        FlowRule flowRuleExpected =
+        FlowRule inportFlowRuleExpected =
                 buildExpectedVlanInPortRule(PORT_1,
                                             VlanId.NONE,
                                             VLAN_100,
                                             FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
 
         // forwarding classifier ipv4
-        actualFlowRule = flowRulesInstalled.get(1);
-        flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
+        FlowRule classifierV4FlowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           ROUTER_MAC,
                                                           null,
                                                           Ethernet.TYPE_IPV4,
-                                                          FabricFilteringPipeliner.FWD_IPV4_ROUTING);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
+                                                          FilteringObjectiveTranslator.FWD_IPV4_ROUTING);
 
         // forwarding classifier ipv6
-        actualFlowRule = flowRulesInstalled.get(2);
-        flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
+        FlowRule classifierV6FlowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           ROUTER_MAC,
                                                           null,
                                                           Ethernet.TYPE_IPV6,
-                                                          FabricFilteringPipeliner.FWD_IPV6_ROUTING);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
+                                                          FilteringObjectiveTranslator.FWD_IPV6_ROUTING);
 
         // forwarding classifier mpls
-        actualFlowRule = flowRulesInstalled.get(3);
-        flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
+        FlowRule classifierMplsFlowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           ROUTER_MAC,
                                                           null,
                                                           Ethernet.MPLS_UNICAST,
-                                                          FabricFilteringPipeliner.FWD_MPLS);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
+                                                          FilteringObjectiveTranslator.FWD_MPLS);
+
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(inportFlowRuleExpected)
+                .addFlowRule(classifierV4FlowRuleExpected)
+                .addFlowRule(classifierV6FlowRuleExpected)
+                .addFlowRule(classifierMplsFlowRuleExpected)
+                .build();
+
+        assertEquals(expectedTranslation, actualTranslation);
     }
 
     /**
@@ -106,7 +107,7 @@
      * multicast mac address.
      */
     @Test
-    public void testIpv4MulticastFwdClass() {
+    public void testIpv4MulticastFwdClass() throws FabricPipelinerException {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .pushVlan()
                 .setVlanId(VLAN_100)
@@ -121,29 +122,28 @@
                 .fromApp(APP_ID)
                 .makePermanent()
                 .add();
-        PipelinerTranslationResult result = pipeliner.pipelinerFilter.filter(filteringObjective);
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-
-        assertTrue(groupsInstalled.isEmpty());
+        ObjectiveTranslation actualTranslation = translator.translate(filteringObjective);
 
         // in port vlan flow rule
-        FlowRule actualFlowRule = flowRulesInstalled.get(0);
-        FlowRule flowRuleExpected =
+        FlowRule inportFlowRuleExpected =
                 buildExpectedVlanInPortRule(PORT_1,
                                             VlanId.NONE,
                                             VLAN_100,
                                             FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
 
         // forwarding classifier
-        actualFlowRule = flowRulesInstalled.get(1);
-        flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
+        FlowRule classifierFlowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           MacAddress.IPV4_MULTICAST,
                                                           MacAddress.IPV4_MULTICAST_MASK,
                                                           Ethernet.TYPE_IPV4,
-                                                          FabricFilteringPipeliner.FWD_IPV4_ROUTING);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
+                                                          FilteringObjectiveTranslator.FWD_IPV4_ROUTING);
+
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(inportFlowRuleExpected)
+                .addFlowRule(classifierFlowRuleExpected)
+                .build();
+
+        assertEquals(expectedTranslation, actualTranslation);
     }
 
     /**
@@ -152,7 +152,7 @@
      * multicast mac address.
      */
     @Test
-    public void testIpv6MulticastFwdClass() {
+    public void testIpv6MulticastFwdClass() throws FabricPipelinerException {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .pushVlan()
                 .setVlanId(VLAN_100)
@@ -167,29 +167,27 @@
                 .fromApp(APP_ID)
                 .makePermanent()
                 .add();
-        PipelinerTranslationResult result = pipeliner.pipelinerFilter.filter(filteringObjective);
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-
-        assertTrue(groupsInstalled.isEmpty());
+        ObjectiveTranslation actualTranslation = translator.translate(filteringObjective);
 
         // in port vlan flow rule
-        FlowRule actualFlowRule = flowRulesInstalled.get(0);
-        FlowRule flowRuleExpected =
+        FlowRule inportFlowRuleExpected =
                 buildExpectedVlanInPortRule(PORT_1,
                                             VlanId.NONE,
                                             VLAN_100,
                                             FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
 
-        // forwarding classifier
-        actualFlowRule = flowRulesInstalled.get(1);
-        flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
+        FlowRule classifierFlowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           MacAddress.IPV6_MULTICAST,
                                                           MacAddress.IPV6_MULTICAST_MASK,
                                                           Ethernet.TYPE_IPV6,
-                                                          FabricFilteringPipeliner.FWD_IPV6_ROUTING);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
+                                                          FilteringObjectiveTranslator.FWD_IPV6_ROUTING);
+
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(inportFlowRuleExpected)
+                .addFlowRule(classifierFlowRuleExpected)
+                .build();
+
+        assertEquals(expectedTranslation, actualTranslation);
     }
 
     /**
@@ -198,51 +196,65 @@
      * The packet will be handled by bridging table by default.
      */
     @Test
-    public void testFwdBridging() {
+    public void testFwdBridging() throws Exception {
         FilteringObjective filteringObjective = buildFilteringObjective(null);
-        PipelinerTranslationResult result = pipeliner.pipelinerFilter.filter(filteringObjective);
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-
-        assertTrue(groupsInstalled.isEmpty());
+        ObjectiveTranslation actualTranslation = translator.translate(filteringObjective);
 
         // in port vlan flow rule
-        FlowRule actualFlowRule = flowRulesInstalled.get(0);
         FlowRule flowRuleExpected =
                 buildExpectedVlanInPortRule(PORT_1,
                                             VlanId.NONE,
                                             VLAN_100,
                                             FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN);
-        assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
 
         // No rules in forwarding classifier, will do default action: set fwd type to bridging
+
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(flowRuleExpected)
+                .build();
+
+        assertEquals(expectedTranslation, actualTranslation);
     }
 
     /**
-     * We supports only PERMIT type of filtering objective.
+     * Test DENY objective.
      */
     @Test
-    public void testUnsupportedObjective() {
+    public void testDenyObjective() throws FabricPipelinerException {
         FilteringObjective filteringObjective = DefaultFilteringObjective.builder()
                 .deny()
                 .withKey(Criteria.matchInPort(PORT_1))
-                .addCondition(Criteria.matchVlanId(VLAN_100))
+                .addCondition(Criteria.matchVlanId(VlanId.NONE))
                 .fromApp(APP_ID)
                 .makePermanent()
+                .withPriority(PRIORITY)
                 .add();
 
-        PipelinerTranslationResult result = pipeliner.pipelinerFilter.filter(filteringObjective);
-        pipeliner.pipelinerFilter.filter(filteringObjective);
+        ObjectiveTranslation actualTranslation = translator.translate(filteringObjective);
 
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
+        TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
+                .matchInPort(PORT_1)
+                .matchPi(VLAN_INVALID);
+        PiAction piAction = PiAction.builder()
+                    .withId(FabricConstants.FABRIC_INGRESS_FILTERING_DENY)
+                    .build();
+        FlowRule expectedFlowRule = DefaultFlowRule.builder()
+                .withPriority(PRIORITY)
+                .withSelector(selector.build())
+                .withTreatment(DefaultTrafficTreatment.builder()
+                                       .piTableAction(piAction).build())
+                .fromApp(APP_ID)
+                .forDevice(DEVICE_ID)
+                .makePermanent()
+                .forTable(FabricConstants.FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN)
+                .build();
 
-        assertTrue(flowRulesInstalled.isEmpty());
-        assertTrue(groupsInstalled.isEmpty());
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(expectedFlowRule)
+                .build();
 
-        assertTrue(result.error().isPresent());
-        ObjectiveError error = result.error().get();
-        assertEquals(ObjectiveError.UNSUPPORTED, error);
+        assertEquals(expectedTranslation, actualTranslation);
+
     }
 
     /**
@@ -258,12 +270,8 @@
                 .makePermanent()
                 .add();
 
-        PipelinerTranslationResult result = pipeliner.pipelinerFilter.filter(filteringObjective);
-        pipeliner.pipelinerFilter.filter(filteringObjective);
-
-        assertTrue(result.error().isPresent());
-        ObjectiveError error = result.error().get();
-        assertEquals(ObjectiveError.BADPARAMS, error);
+        ObjectiveTranslation result1 = translator.translate(filteringObjective);
+        assertError(ObjectiveError.BADPARAMS, result1);
 
         // Filtering objective should use in_port as key
         filteringObjective = DefaultFilteringObjective.builder()
@@ -275,16 +283,17 @@
                 .makePermanent()
                 .add();
 
-        result = pipeliner.pipelinerFilter.filter(filteringObjective);
-        pipeliner.pipelinerFilter.filter(filteringObjective);
-
-        assertTrue(result.error().isPresent());
-        error = result.error().get();
-        assertEquals(ObjectiveError.BADPARAMS, error);
+        ObjectiveTranslation result2 = translator.translate(filteringObjective);
+        assertError(ObjectiveError.BADPARAMS, result2);
     }
 
     /* Utilities */
 
+    private void assertError(ObjectiveError error, ObjectiveTranslation actualTranslation) {
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.ofError(error);
+        assertEquals(expectedTranslation, actualTranslation);
+    }
+
     private FilteringObjective buildFilteringObjective(MacAddress dstMac) {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .pushVlan()
@@ -311,20 +320,27 @@
 
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
                 .matchInPort(inPort);
-        TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
+        PiAction piAction;
         if (vlanId == null || vlanId.equals(VlanId.NONE)) {
             selector.matchPi(VLAN_INVALID);
-            treatment.pushVlan();
-            treatment.setVlanId(internalVlan);
+            piAction = PiAction.builder()
+                    .withId(FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN)
+                    .withParameter(new PiActionParam(
+                            FabricConstants.VLAN_ID, internalVlan.toShort()))
+                    .build();
         } else {
             selector.matchPi(VLAN_VALID);
             selector.matchVlanId(vlanId);
+            piAction = PiAction.builder()
+                    .withId(FabricConstants.FABRIC_INGRESS_FILTERING_PERMIT)
+                    .build();
         }
 
         return DefaultFlowRule.builder()
                 .withPriority(PRIORITY)
                 .withSelector(selector.build())
-                .withTreatment(treatment.build())
+                .withTreatment(DefaultTrafficTreatment.builder()
+                                       .piTableAction(piAction).build())
                 .fromApp(APP_ID)
                 .forDevice(DEVICE_ID)
                 .makePermanent()
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
index bb06dd3..9c04d8f 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
@@ -16,6 +16,7 @@
 
 package org.onosproject.pipelines.fabric.pipeliner;
 
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.onlab.packet.Ethernet;
@@ -49,13 +50,20 @@
  */
 public class FabricForwardingPipelineTest extends FabricPipelinerTest {
 
+    private ForwardingObjectiveTranslator translator;
+
+    @Before
+    public void setup() {
+        super.doSetup();
+        translator = new ForwardingObjectiveTranslator(DEVICE_ID, capabilitiesHashed);
+    }
+
     /**
      * Test versatile flag of forwarding objective with ARP match.
      */
     @Test
     public void testAclArp() {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .wipeDeferred()
                 .punt()
                 .build();
         // ARP
@@ -71,7 +79,7 @@
                 .withTreatment(treatment)
                 .add();
 
-        PipelinerTranslationResult result = pipeliner.pipelinerForward.forward(fwd);
+        ObjectiveTranslation result = translator.translate(fwd);
 
         List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
         List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
@@ -79,13 +87,17 @@
         assertTrue(groupsInstalled.isEmpty());
 
         FlowRule actualFlowRule = flowRulesInstalled.get(0);
+        PiAction piAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_ACL_CLONE_TO_CPU)
+                .build();
         FlowRule expectedFlowRule = DefaultFlowRule.builder()
                 .forDevice(DEVICE_ID)
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)
+                .forTable(FabricConstants.FABRIC_INGRESS_ACL_ACL)
                 .withPriority(PRIORITY)
                 .makePermanent()
                 .withSelector(selector)
-                .withTreatment(treatment)
+                .withTreatment(DefaultTrafficTreatment.builder()
+                                       .piTableAction(piAction).build())
                 .fromApp(APP_ID)
                 .build();
 
@@ -117,7 +129,7 @@
                 .withTreatment(treatment)
                 .add();
 
-        PipelinerTranslationResult result = pipeliner.pipelinerForward.forward(fwd);
+        ObjectiveTranslation result = translator.translate(fwd);
 
         List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
         List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
@@ -125,13 +137,17 @@
         assertTrue(groupsInstalled.isEmpty());
 
         FlowRule actualFlowRule = flowRulesInstalled.get(0);
+        PiAction piAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_ACL_PUNT_TO_CPU)
+                .build();
         FlowRule expectedFlowRule = DefaultFlowRule.builder()
                 .forDevice(DEVICE_ID)
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)
+                .forTable(FabricConstants.FABRIC_INGRESS_ACL_ACL)
                 .withPriority(PRIORITY)
                 .makePermanent()
                 .withSelector(selector)
-                .withTreatment(treatment)
+                .withTreatment(DefaultTrafficTreatment.builder()
+                                       .piTableAction(piAction).build())
                 .fromApp(APP_ID)
                 .build();
 
@@ -142,7 +158,7 @@
      * Test programming L2 unicast rule to bridging table.
      */
     @Test
-    public void testL2Unicast() {
+    public void testL2Unicast() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchVlanId(VLAN_100)
                 .matchEthDst(HOST_MAC)
@@ -152,7 +168,7 @@
     }
 
     @Test
-    public void testL2Broadcast() {
+    public void testL2Broadcast() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchVlanId(VLAN_100)
                 .build();
@@ -161,7 +177,7 @@
     }
 
     @Test
-    public void testIPv4Unicast() {
+    public void testIPv4Unicast() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.TYPE_IPV4)
                 .matchIPDst(IPV4_UNICAST_ADDR)
@@ -174,7 +190,7 @@
     }
 
     @Test
-    public void testIPv4UnicastWithNoNextId() {
+    public void testIPv4UnicastWithNoNextId() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.TYPE_IPV4)
                 .matchIPDst(IPV4_UNICAST_ADDR)
@@ -188,7 +204,7 @@
 
     @Test
     @Ignore
-    public void testIPv4Multicast() {
+    public void testIPv4Multicast() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.TYPE_IPV4)
                 .matchVlanId(VLAN_100)
@@ -203,7 +219,7 @@
 
     @Test
     @Ignore
-    public void testIPv6Unicast() {
+    public void testIPv6Unicast() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.TYPE_IPV6)
                 .matchIPDst(IPV6_UNICAST_ADDR)
@@ -218,7 +234,7 @@
 
     @Test
     @Ignore
-    public void testIPv6Multicast() {
+    public void testIPv6Multicast() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.TYPE_IPV6)
                 .matchVlanId(VLAN_100)
@@ -232,7 +248,7 @@
     }
 
     @Test
-    public void testMpls() {
+    public void testMpls() throws FabricPipelinerException {
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.MPLS_UNICAST)
                 .matchMplsLabel(MPLS_10)
@@ -255,11 +271,16 @@
     }
 
     private void testSpecificForward(PiTableId expectedTableId, TrafficSelector expectedSelector,
-                                     TrafficSelector selector, Integer nextId) {
+                                     TrafficSelector selector, Integer nextId) throws FabricPipelinerException {
         TrafficTreatment setNextIdTreatment;
         if (nextId == null) {
             // Ref: RoutingRulePopulator.java->revokeIpRuleForRouter
-            setNextIdTreatment = DefaultTrafficTreatment.builder().build();
+
+            setNextIdTreatment = DefaultTrafficTreatment.builder().
+                    piTableAction(PiAction.builder()
+                                          .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_NOP_ROUTING_V4)
+                                          .build())
+                    .build();
         } else {
             PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, nextId);
             PiAction.Builder setNextIdAction = PiAction.builder()
@@ -283,7 +304,8 @@
     }
 
     private void testSpecificForward(PiTableId expectedTableId, TrafficSelector expectedSelector,
-                                     TrafficSelector selector, Integer nextId, TrafficTreatment treatment) {
+                                     TrafficSelector selector, Integer nextId, TrafficTreatment treatment)
+            throws FabricPipelinerException {
         ForwardingObjective.Builder fwd = DefaultForwardingObjective.builder()
                 .withSelector(selector)
                 .withPriority(PRIORITY)
@@ -296,14 +318,7 @@
             fwd.nextStep(nextId);
         }
 
-        PipelinerTranslationResult result = pipeliner.pipelinerForward.forward(fwd.add());
-
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-        assertEquals(1, flowRulesInstalled.size());
-        assertTrue(groupsInstalled.isEmpty());
-
-        FlowRule actualFlowRule = flowRulesInstalled.get(0);
+        ObjectiveTranslation actualTranslation = translator.translate(fwd.add());
 
         FlowRule expectedFlowRule = DefaultFlowRule.builder()
                 .forDevice(DEVICE_ID)
@@ -315,7 +330,11 @@
                 .fromApp(APP_ID)
                 .build();
 
-        assertTrue(expectedFlowRule.exactMatch(actualFlowRule));
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(expectedFlowRule)
+                .build();
+
+        assertEquals(expectedTranslation, actualTranslation);
     }
 
     private TrafficSelector buildExpectedSelector(TrafficSelector selector) {
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipelinerTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipelinerTest.java
index 1aab0d5..081f68f 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipelinerTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipelinerTest.java
@@ -17,12 +17,8 @@
 package org.onosproject.pipelines.fabric.pipeliner;
 
 import com.google.common.collect.ImmutableList;
-import org.easymock.EasyMock;
+import org.junit.Before;
 import org.junit.Test;
-import org.onlab.junit.TestUtils;
-import org.onlab.util.ImmutableByteSequence;
-import org.onosproject.net.behaviour.DefaultNextGroup;
-import org.onosproject.net.behaviour.NextGroup;
 import org.onosproject.net.flow.DefaultFlowRule;
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -31,9 +27,7 @@
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.criteria.PiCriterion;
 import org.onosproject.net.flowobjective.DefaultNextObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveStore;
 import org.onosproject.net.flowobjective.NextObjective;
-import org.onosproject.net.flowobjective.Objective;
 import org.onosproject.net.group.DefaultGroupBucket;
 import org.onosproject.net.group.DefaultGroupDescription;
 import org.onosproject.net.group.DefaultGroupKey;
@@ -48,34 +42,44 @@
 import org.onosproject.pipelines.fabric.FabricConstants;
 
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Test cases for fabric.p4 pipeline next control block.
  */
 public class FabricNextPipelinerTest extends FabricPipelinerTest {
+
+    private NextObjectiveTranslator translatorHashed;
+    private NextObjectiveTranslator translatorSimple;
+
     private FlowRule vlanMetaFlowRule;
 
-    public FabricNextPipelinerTest() {
+    @Before
+    public void setup() {
+        super.doSetup();
+
+        translatorHashed = new NextObjectiveTranslator(DEVICE_ID, capabilitiesHashed);
+        translatorSimple = new NextObjectiveTranslator(DEVICE_ID, capabilitiesSimple);
+
         PiCriterion nextIdCriterion = PiCriterion.builder()
-                .matchExact(FabricConstants.FABRIC_METADATA_NEXT_ID, NEXT_ID_1)
+                .matchExact(FabricConstants.HDR_NEXT_ID, NEXT_ID_1)
                 .build();
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchPi(nextIdCriterion)
                 .build();
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setVlanId(VLAN_100)
+        PiAction piAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN)
+                .withParameter(new PiActionParam(FabricConstants.VLAN_ID, VLAN_100.toShort()))
                 .build();
-
+        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .piTableAction(piAction)
+                .build();
         vlanMetaFlowRule = DefaultFlowRule.builder()
                 .withSelector(selector)
                 .withTreatment(treatment)
-                .forTable(FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META)
+                .forTable(FabricConstants.FABRIC_INGRESS_NEXT_NEXT_VLAN)
                 .makePermanent()
                 // FIXME: currently next objective doesn't support priority, ignore this
                 .withPriority(0)
@@ -88,53 +92,81 @@
      * Test program output rule for Simple table.
      */
     @Test
-    public void testSimpleOutput() {
+    public void testSimpleOutput() throws FabricPipelinerException {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .setOutput(PORT_1)
                 .build();
-        testSimple(treatment);
+        PiAction piAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE)
+                .withParameter(new PiActionParam(
+                        FabricConstants.PORT_NUM, PORT_1.toLong()))
+                .build();
+        testSimple(treatment, piAction);
     }
 
     /**
      * Test program set vlan and output rule for Simple table.
      */
     @Test
-    public void testSimpleOutputWithVlanTranslation() {
+    public void testSimpleOutputWithVlanTranslation() throws FabricPipelinerException {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .setVlanId(VLAN_100)
                 .setOutput(PORT_1)
                 .build();
-        testSimple(treatment);
+        PiAction piAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE)
+                .withParameter(new PiActionParam(
+                        FabricConstants.PORT_NUM, PORT_1.toLong()))
+                .build();
+        testSimple(treatment, piAction);
     }
 
     /**
      * Test program set mac and output rule for Simple table.
      */
     @Test
-    public void testSimpleOutputWithMacTranslation() {
+    public void testSimpleOutputWithMacTranslation() throws FabricPipelinerException {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .setEthSrc(ROUTER_MAC)
                 .setEthDst(HOST_MAC)
                 .setOutput(PORT_1)
                 .build();
-        testSimple(treatment);
+        PiAction piAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_ROUTING_SIMPLE)
+                .withParameter(new PiActionParam(
+                        FabricConstants.SMAC, ROUTER_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.DMAC, HOST_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.PORT_NUM, PORT_1.toLong()))
+                .build();
+        testSimple(treatment, piAction);
     }
 
     /**
      * Test program set mac, set vlan, and output rule for Simple table.
      */
     @Test
-    public void testSimpleOutputWithVlanAndMacTranslation() {
+    public void testSimpleOutputWithVlanAndMacTranslation() throws FabricPipelinerException {
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .setEthSrc(ROUTER_MAC)
                 .setEthDst(HOST_MAC)
                 .setVlanId(VLAN_100)
                 .setOutput(PORT_1)
                 .build();
-        testSimple(treatment);
+        PiAction piAction = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_ROUTING_SIMPLE)
+                .withParameter(new PiActionParam(
+                        FabricConstants.SMAC, ROUTER_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.DMAC, HOST_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.PORT_NUM, PORT_1.toLong()))
+                .build();
+        testSimple(treatment, piAction);
     }
 
-    private void testSimple(TrafficTreatment treatment) {
+    private void testSimple(TrafficTreatment treatment, PiAction piAction) throws FabricPipelinerException {
         NextObjective nextObjective = DefaultNextObjective.builder()
                 .withId(NEXT_ID_1)
                 .withPriority(PRIORITY)
@@ -145,26 +177,15 @@
                 .fromApp(APP_ID)
                 .add();
 
-        PipelinerTranslationResult result = pipeliner.pipelinerNext.next(nextObjective);
-
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-        assertEquals(2, flowRulesInstalled.size());
-        assertTrue(groupsInstalled.isEmpty());
+        ObjectiveTranslation actualTranslation = translatorSimple.translate(nextObjective);
 
         // Simple table
         PiCriterion nextIdCriterion = PiCriterion.builder()
-                .matchExact(FabricConstants.FABRIC_METADATA_NEXT_ID, NEXT_ID_1)
+                .matchExact(FabricConstants.HDR_NEXT_ID, NEXT_ID_1)
                 .build();
         TrafficSelector nextIdSelector = DefaultTrafficSelector.builder()
                 .matchPi(nextIdCriterion)
                 .build();
-
-        // VLAN meta table
-        FlowRule actualFlowRule = flowRulesInstalled.get(0);
-        assertTrue(actualFlowRule.exactMatch(vlanMetaFlowRule));
-
-        actualFlowRule = flowRulesInstalled.get(1);
         FlowRule expectedFlowRule = DefaultFlowRule.builder()
                 .forDevice(DEVICE_ID)
                 .fromApp(APP_ID)
@@ -173,9 +194,16 @@
                 .withPriority(0)
                 .forTable(FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)
                 .withSelector(nextIdSelector)
-                .withTreatment(treatment)
+                .withTreatment(DefaultTrafficTreatment.builder()
+                                       .piTableAction(piAction).build())
                 .build();
-        assertTrue(expectedFlowRule.exactMatch(actualFlowRule));
+
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(vlanMetaFlowRule)
+                .addFlowRule(expectedFlowRule)
+                .build();
+
+        assertEquals(expectedTranslation, actualTranslation);
     }
 
     /**
@@ -183,15 +211,29 @@
      */
     @Test
     public void testHashedOutput() throws Exception {
+        PiAction piAction1 = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_ROUTING_HASHED)
+                .withParameter(new PiActionParam(
+                        FabricConstants.SMAC, ROUTER_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.DMAC, HOST_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.PORT_NUM, PORT_1.toLong()))
+                .build();
+        PiAction piAction2 = PiAction.builder()
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_ROUTING_HASHED)
+                .withParameter(new PiActionParam(
+                        FabricConstants.SMAC, ROUTER_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.DMAC, HOST_MAC.toBytes()))
+                .withParameter(new PiActionParam(
+                        FabricConstants.PORT_NUM, PORT_1.toLong()))
+                .build();
         TrafficTreatment treatment1 = DefaultTrafficTreatment.builder()
-                .setEthSrc(ROUTER_MAC)
-                .setEthDst(HOST_MAC)
-                .setOutput(PORT_1)
+                .piTableAction(piAction1)
                 .build();
         TrafficTreatment treatment2 = DefaultTrafficTreatment.builder()
-                .setEthSrc(ROUTER_MAC)
-                .setEthDst(HOST_MAC)
-                .setOutput(PORT_2)
+                .piTableAction(piAction2)
                 .build();
 
         NextObjective nextObjective = DefaultNextObjective.builder()
@@ -205,17 +247,11 @@
                 .fromApp(APP_ID)
                 .add();
 
-        PipelinerTranslationResult result = pipeliner.pipelinerNext.next(nextObjective);
+        ObjectiveTranslation actualTranslation = translatorHashed.doTranslate(nextObjective);
 
-        // Should generates 2 flows and 1 group
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-        assertEquals(2, flowRulesInstalled.size());
-        assertEquals(1, groupsInstalled.size());
-
-        // Hashed table
+        // Expected hashed table flow rule.
         PiCriterion nextIdCriterion = PiCriterion.builder()
-                .matchExact(FabricConstants.FABRIC_METADATA_NEXT_ID, NEXT_ID_1)
+                .matchExact(FabricConstants.HDR_NEXT_ID, NEXT_ID_1)
                 .build();
         TrafficSelector nextIdSelector = DefaultTrafficSelector.builder()
                 .matchPi(nextIdCriterion)
@@ -224,12 +260,6 @@
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .piTableAction(actionGroupId)
                 .build();
-
-        // VLAN meta table
-        FlowRule actualFlowRule = flowRulesInstalled.get(0);
-        assertTrue(actualFlowRule.exactMatch(vlanMetaFlowRule));
-
-        actualFlowRule = flowRulesInstalled.get(1);
         FlowRule expectedFlowRule = DefaultFlowRule.builder()
                 .forDevice(DEVICE_ID)
                 .fromApp(APP_ID)
@@ -240,18 +270,15 @@
                 .withSelector(nextIdSelector)
                 .withTreatment(treatment)
                 .build();
-        assertTrue(expectedFlowRule.exactMatch(actualFlowRule));
 
-        // Group
-        GroupDescription actualGroup = groupsInstalled.get(0);
+        // Expected group
         List<TrafficTreatment> treatments = ImmutableList.of(treatment1, treatment2);
-
         List<GroupBucket> buckets = treatments.stream()
                 .map(DefaultGroupBucket::createSelectGroupBucket)
                 .collect(Collectors.toList());
         GroupBuckets groupBuckets = new GroupBuckets(buckets);
         PiGroupKey groupKey = new PiGroupKey(FabricConstants.FABRIC_INGRESS_NEXT_HASHED,
-                                             FabricConstants.FABRIC_INGRESS_NEXT_ECMP_SELECTOR,
+                                             FabricConstants.FABRIC_INGRESS_NEXT_HASHED_SELECTOR,
                                              NEXT_ID_1);
         GroupDescription expectedGroup = new DefaultGroupDescription(
                 DEVICE_ID,
@@ -261,7 +288,14 @@
                 NEXT_ID_1,
                 APP_ID
         );
-        assertEquals(expectedGroup, actualGroup);
+
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(expectedFlowRule)
+                .addFlowRule(vlanMetaFlowRule)
+                .addGroup(expectedGroup)
+                .build();
+
+        assertEquals(expectedTranslation, actualTranslation);
 
     }
 
@@ -269,7 +303,7 @@
      * Test program output group for Broadcast table.
      */
     @Test
-    public void testBroadcastOutput() {
+    public void testBroadcastOutput() throws FabricPipelinerException {
         TrafficTreatment treatment1 = DefaultTrafficTreatment.builder()
                 .setOutput(PORT_1)
                 .build();
@@ -288,35 +322,31 @@
                 .fromApp(APP_ID)
                 .add();
 
-        PipelinerTranslationResult result = pipeliner.pipelinerNext.next(nextObjective);
+        ObjectiveTranslation actualTranslation = translatorHashed.doTranslate(nextObjective);
 
-        // Should generate 1 flow, 1 group and 2 buckets in it
-        List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
-        List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
-        assertEquals(3, flowRulesInstalled.size());
-        assertEquals(1, groupsInstalled.size());
-        // FIXME: expected should be 2
-        // But we are adding an extra bucket to clone the pkt to the CPU
-        assertEquals(3, groupsInstalled.get(0).buckets().buckets().size());
+        // Should generate 3 flows:
+        // - Multicast table flow that matches on next-id and set multicast group (1)
+        // - Egress VLAN pop handling for treatment2 (0)
+        // - Next VLAN flow (2)
+        // And 2 groups:
+        // - Multicast group
 
-        //create the expected flow rule
+        // Expected multicast table flow rule.
         PiCriterion nextIdCriterion = PiCriterion.builder()
-                .matchExact(FabricConstants.FABRIC_METADATA_NEXT_ID, NEXT_ID_1)
+                .matchExact(FabricConstants.HDR_NEXT_ID, NEXT_ID_1)
                 .build();
         TrafficSelector nextIdSelector = DefaultTrafficSelector.builder()
                 .matchPi(nextIdCriterion)
                 .build();
-
-        PiActionParam groupIdParam = new PiActionParam(FabricConstants.GID,
-                                                       ImmutableByteSequence.copyFrom(NEXT_ID_1));
         PiAction setMcGroupAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_MCAST_GROUP)
-                .withParameter(groupIdParam)
+                .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_MCAST_GROUP_ID)
+                .withParameter(new PiActionParam(
+                        FabricConstants.GROUP_ID, NEXT_ID_1))
                 .build();
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .piTableAction(setMcGroupAction)
                 .build();
-        FlowRule expectedFlowRule = DefaultFlowRule.builder()
+        FlowRule expectedHashedFlowRule = DefaultFlowRule.builder()
                 .forDevice(DEVICE_ID)
                 .fromApp(APP_ID)
                 .makePermanent()
@@ -326,24 +356,19 @@
                 .withTreatment(treatment)
                 .build();
 
-        // VLAN meta table
-        FlowRule vmFlowRule = flowRulesInstalled.get(0);
-        assertTrue(vmFlowRule.exactMatch(vlanMetaFlowRule));
-
-        FlowRule actualFlowRule = flowRulesInstalled.get(1);
-        assertTrue(expectedFlowRule.exactMatch(actualFlowRule));
-
-        //prepare expected egress rule for the egress vlan pipeline
+        // Expected egress VLAN POP flow rule.
         PiCriterion egressVlanTableMatch = PiCriterion.builder()
-                .matchExact(FabricConstants.STANDARD_METADATA_EGRESS_PORT,
-                            (short) PORT_2.toLong())
+                .matchExact(FabricConstants.HDR_EG_PORT, PORT_2.toLong())
                 .build();
         TrafficSelector selectorForEgressVlan = DefaultTrafficSelector.builder()
                 .matchPi(egressVlanTableMatch)
                 .matchVlanId(VLAN_100)
                 .build();
+        PiAction piActionForEgressVlan = PiAction.builder()
+                .withId(FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN)
+                .build();
         TrafficTreatment treatmentForEgressVlan = DefaultTrafficTreatment.builder()
-                .popVlan()
+                .piTableAction(piActionForEgressVlan)
                 .build();
         FlowRule expectedEgressVlanRule = DefaultFlowRule.builder()
                 .withSelector(selectorForEgressVlan)
@@ -354,78 +379,40 @@
                 .forDevice(DEVICE_ID)
                 .fromApp(APP_ID)
                 .build();
-        //egress vlan table
-        FlowRule actualEgressVlanFlowRule = flowRulesInstalled.get(2);
-        assertTrue(expectedEgressVlanRule.exactMatch(actualEgressVlanFlowRule));
 
-        //create the expected group
-        GroupDescription actualGroup = groupsInstalled.get(0);
-        TrafficTreatment groupTreatment1 = DefaultTrafficTreatment.builder()
+        // Expected ALL group.
+        TrafficTreatment allGroupTreatment1 = DefaultTrafficTreatment.builder()
                 .setOutput(PORT_1)
                 .build();
-        TrafficTreatment groupTreatment2 = DefaultTrafficTreatment.builder()
+        TrafficTreatment allGroupTreatment2 = DefaultTrafficTreatment.builder()
                 .setOutput(PORT_2)
                 .build();
-        List<TrafficTreatment> treatments = ImmutableList.of(groupTreatment1, groupTreatment2);
-
-        List<GroupBucket> buckets = treatments.stream()
+        List<TrafficTreatment> allTreatments = ImmutableList.of(
+                allGroupTreatment1, allGroupTreatment2);
+        List<GroupBucket> allBuckets = allTreatments.stream()
                 .map(DefaultGroupBucket::createAllGroupBucket)
                 .collect(Collectors.toList());
-
         // FIXME: remove when we implement proper clone to CPU behavior
-        buckets.add(DefaultGroupBucket.createAllGroupBucket(
+        allBuckets.add(DefaultGroupBucket.createAllGroupBucket(
                 DefaultTrafficTreatment.builder().punt().build()));
-
-        GroupBuckets groupBuckets = new GroupBuckets(buckets);
-
-        GroupKey groupKey = new DefaultGroupKey(FabricPipeliner.KRYO.serialize(NEXT_ID_1));
-
-        GroupDescription expectedGroup = new DefaultGroupDescription(
+        GroupBuckets allGroupBuckets = new GroupBuckets(allBuckets);
+        GroupKey allGroupKey = new DefaultGroupKey(FabricPipeliner.KRYO.serialize(NEXT_ID_1));
+        GroupDescription expectedAllGroup = new DefaultGroupDescription(
                 DEVICE_ID,
                 GroupDescription.Type.ALL,
-                groupBuckets,
-                groupKey,
+                allGroupBuckets,
+                allGroupKey,
                 NEXT_ID_1,
                 APP_ID
         );
-        assertEquals(expectedGroup, actualGroup);
-    }
 
-    /**
-     * Test removing next objective, and expect the next objective data will be removed from the store.
-     */
-    @Test
-    public void testRemoveNextObjective() {
-        // Initialize mock objects
-        NextObjective mockNextObjective = DefaultNextObjective.builder()
-                .fromApp(APP_ID)
-                .withId(NEXT_ID_1)
-                .makePermanent()
-                .withPriority(PRIORITY)
-                .withType(NextObjective.Type.SIMPLE)
-                .remove();
-        FlowObjectiveStore mockFlowObjStore = EasyMock.createNiceMock(FlowObjectiveStore.class);
-        FabricNextPipeliner mockNextPipeliner = EasyMock.createNiceMock(FabricNextPipeliner.class);
-        PipelinerTranslationResult mockResult = PipelinerTranslationResult.builder().build(); // empty result
-        NextGroup mockNextGroup = new DefaultNextGroup(null);
-        expect(mockNextPipeliner.next(mockNextObjective)).andReturn(mockResult).once();
-        expect(mockFlowObjStore.getNextGroup(mockNextObjective.id())).andReturn(mockNextGroup).once();
-        expect(mockFlowObjStore.removeNextGroup(mockNextObjective.id())).andReturn(mockNextGroup).once();
-        replay(mockNextPipeliner, mockFlowObjStore);
+        ObjectiveTranslation expectedTranslation = ObjectiveTranslation.builder()
+                .addFlowRule(expectedHashedFlowRule)
+                .addFlowRule(vlanMetaFlowRule)
+                .addFlowRule(expectedEgressVlanRule)
+                .addGroup(expectedAllGroup)
+                .build();
 
-        // Initialize the pipeliner
-        FabricPipeliner thePipeliner = new FabricPipeliner();
-        thePipeliner.pipelinerNext = mockNextPipeliner;
-        TestUtils.setField(thePipeliner, "flowObjectiveStore", mockFlowObjStore);
-        // execute removing process
-        thePipeliner.next(mockNextObjective);
-        Map<Objective, FabricPipeliner.PendingInstallObjective> pios =
-                TestUtils.getField(thePipeliner, "pendingInstallObjectives");
-        FabricPipeliner.PendingInstallObjective pio = pios.get(mockNextObjective);
-        pio.callback.accept(null); // applying successful result
-
-        // "removeNextGroup" method should be called once, or failed if not.
-        verify(mockNextPipeliner, mockFlowObjStore);
-
+        assertEquals(expectedTranslation, actualTranslation);
     }
 }
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java
index c361377..a5704da 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java
@@ -16,10 +16,7 @@
 
 package org.onosproject.pipelines.fabric.pipeliner;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.onlab.junit.TestUtils;
-import org.onlab.osgi.ServiceDirectory;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.MplsLabel;
@@ -28,15 +25,11 @@
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.PipelinerContext;
-import org.onosproject.net.driver.Driver;
-import org.onosproject.net.driver.DriverHandler;
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.criteria.PiCriterion;
-import org.onosproject.net.group.GroupService;
+import org.onosproject.pipelines.fabric.FabricCapabilities;
 import org.onosproject.pipelines.fabric.FabricConstants;
-import org.onosproject.pipelines.fabric.FabricInterpreter;
 
 import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
@@ -60,36 +53,23 @@
     static final TrafficSelector VLAN_META = DefaultTrafficSelector.builder()
             .matchVlanId(VLAN_100)
             .build();
-
     static final PiCriterion VLAN_VALID = PiCriterion.builder()
-            .matchExact(FabricConstants.HDR_VLAN_TAG_IS_VALID, new byte[]{1})
+            .matchExact(FabricConstants.HDR_VLAN_IS_VALID, new byte[]{1})
             .build();
     static final PiCriterion VLAN_INVALID = PiCriterion.builder()
-            .matchExact(FabricConstants.HDR_VLAN_TAG_IS_VALID, new byte[]{0})
+            .matchExact(FabricConstants.HDR_VLAN_IS_VALID, new byte[]{0})
             .build();
 
-    FabricPipeliner pipeliner;
-    FabricInterpreter interpreter;
+    FabricCapabilities capabilitiesHashed;
+    FabricCapabilities capabilitiesSimple;
 
-    @Before
-    public void setup() {
-        pipeliner = new FabricPipeliner();
-
-        GroupService mockGroupService = createNiceMock(GroupService.class);
-        ServiceDirectory serviceDirectory = createNiceMock(ServiceDirectory.class);
-        PipelinerContext pipelinerContext = createNiceMock(PipelinerContext.class);
-        DriverHandler driverHandler = createNiceMock(DriverHandler.class);
-        Driver mockDriver = createNiceMock(Driver.class);
-        expect(mockDriver.getProperty("supportTableCounters")).andReturn("true").anyTimes();
-        expect(mockDriver.getProperty("noHashedTable")).andReturn("false").anyTimes();
-        expect(driverHandler.driver()).andReturn(mockDriver).anyTimes();
-        expect(pipelinerContext.directory()).andReturn(serviceDirectory).anyTimes();
-        expect(serviceDirectory.get(GroupService.class)).andReturn(mockGroupService).anyTimes();
-        replay(serviceDirectory, pipelinerContext, driverHandler, mockDriver);
-        TestUtils.setField(pipeliner, "handler", driverHandler);
-
-        pipeliner.init(DEVICE_ID, pipelinerContext);
-        interpreter = new FabricInterpreter();
+    void doSetup() {
+        this.capabilitiesHashed = createNiceMock(FabricCapabilities.class);
+        this.capabilitiesSimple = createNiceMock(FabricCapabilities.class);
+        expect(capabilitiesHashed.hasHashedTable()).andReturn(true).anyTimes();
+        expect(capabilitiesSimple.hasHashedTable()).andReturn(false).anyTimes();
+        replay(capabilitiesHashed);
+        replay(capabilitiesSimple);
     }
 
     @Test
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java
index 1ef11c2..2121b4f 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java
@@ -39,6 +39,7 @@
     private static final ApplicationId APP_ID = TestApplicationId.create("ForwardingFunctionTypeTest");
     private static final VlanId VLAN_100 = VlanId.vlanId((short) 100);
     private static final MacAddress MAC_ADDR = MacAddress.valueOf("00:00:00:00:00:01");
+    private static final MacAddress MAC_NONE = MacAddress.NONE;
     private static final IpPrefix IPV4_UNICAST_ADDR = IpPrefix.valueOf("10.0.0.1/32");
     private static final IpPrefix IPV4_MCAST_ADDR = IpPrefix.valueOf("224.0.0.1/32");
     private static final IpPrefix IPV6_UNICAST_ADDR = IpPrefix.valueOf("2000::1/32");
@@ -67,6 +68,15 @@
     }
 
     @Test
+    public void testL2BroadcastWithMacNone() {
+        selector = DefaultTrafficSelector.builder()
+                .matchVlanId(VLAN_100)
+                .matchEthDst(MAC_NONE)
+                .build();
+        testFft(selector, ForwardingFunctionType.L2_BROADCAST);
+    }
+
+    @Test
     public void testIpv4Unicast() {
         selector = DefaultTrafficSelector.builder()
                 .matchEthType(Ethernet.TYPE_IPV4)
@@ -112,7 +122,7 @@
                 .matchMplsLabel(MPLS_10)
                 .matchMplsBos(true)
                 .build();
-        testFft(selector, ForwardingFunctionType.MPLS);
+        testFft(selector, ForwardingFunctionType.MPLS_SEGMENT_ROUTING);
     }
 
     private void testFft(TrafficSelector selector, ForwardingFunctionType expectedFft) {
diff --git a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
index dd968ce..d69ec32 100644
--- a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
+++ b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
@@ -1115,7 +1115,7 @@
             }
             return okEntities;
         } else {
-            log.warn("Unable to reconcile error details to updates " +
+            log.warn("Unable to reconcile error details to {} updates " +
                              "(sent {} updates, but device returned {} errors)",
                      entryType, writeEntities.size(), errors.size());
             errors.stream()
diff --git a/tools/dev/bin/onos-gen-p4-constants b/tools/dev/bin/onos-gen-p4-constants
index 566ba4f..80f8f63 100755
--- a/tools/dev/bin/onos-gen-p4-constants
+++ b/tools/dev/bin/onos-gen-p4-constants
@@ -1,11 +1,10 @@
 #!/usr/bin/env python2.7
 # -*- utf-8 -*-
 import argparse
-import re
 import google.protobuf.text_format as tf
+import re
 from p4.config.v1 import p4info_pb2
 
-
 copyright = '''/*
  * Copyright 2017-present Open Networking Foundation
  *
@@ -74,6 +73,9 @@
 PI_PKT_META_ID = 'PiControlMetadataId'
 PI_PKT_META_ID_CST = 'PiControlMetadataId.of("%s")'
 
+HF_VAR_PREFIX = 'HDR_'
+
+
 class ConstantClassGenerator(object):
     headers = set()
     header_fields = set()
@@ -125,6 +127,8 @@
 
     def const_line(self, name, type, constructor):
         var_name = self.convert_camel_to_all_caps(name)
+        if type == PI_HF_FIELD_ID:
+            var_name = HF_VAR_PREFIX + var_name
         val = constructor % (name, )
 
         line = CONST_FMT % (type, var_name, val)
diff --git a/tools/dev/p4vm/install-p4-tools.sh b/tools/dev/p4vm/install-p4-tools.sh
index e2ca928..8efc4a3 100755
--- a/tools/dev/p4vm/install-p4-tools.sh
+++ b/tools/dev/p4vm/install-p4-tools.sh
@@ -50,8 +50,10 @@
         curl \
         flex \
         git \
+        graphviz \
         libavl-dev \
         libboost-dev \
+        libboost-graph-dev \
         libboost-program-options-dev \
         libboost-system-dev \
         libboost-filesystem-dev \
diff --git a/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java b/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java
index cdd3691..4794a24 100644
--- a/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java
+++ b/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java
@@ -393,9 +393,20 @@
         return index;
     }
 
+    /**
+     * Returns a hexadecimal representation of this byte sequence, e.g.
+     * 0xbeef. The length of the returned string is not representative of the
+     * length of the byte sequence, as all padding zeros are removed.
+     *
+     * @return hexadecimal representation
+     */
     @Override
     public String toString() {
-        return HexString.toHexString(value.array());
+        final String hexValue = HexString
+                .toHexString(value.array(), "")
+                // Remove leading zeros, but leave one if string is all zeros.
+                .replaceFirst("^0+(?!$)", "");
+        return "0x" + hexValue;
     }
 
     /**