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 eb927ad..f1bb185 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
@@ -223,6 +223,8 @@
             PiActionId.of("FabricEgress.process_int_main.process_int_transit.init_metadata");
     public static final PiActionId FABRIC_INGRESS_ACL_DROP =
             PiActionId.of("FabricIngress.acl.drop");
+    public static final PiActionId FABRIC_INGRESS_ACL_SET_CLONE_SESSION_ID =
+            PiActionId.of("FabricIngress.acl.set_clone_session_id");
     public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_PUNT_TO_CPU =
             PiActionId.of("FabricIngress.bng_ingress.upstream.punt_to_cpu");
     public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_SET_LINE =
@@ -276,8 +278,6 @@
     public static final PiActionId NOP = PiActionId.of("nop");
     public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE =
             PiActionId.of("FabricIngress.next.output_simple");
-    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_NEXT_SET_MCAST_GROUP_ID =
@@ -298,6 +298,8 @@
     public static final PiActionParamId S1U_SGW_ADDR =
             PiActionParamId.of("s1u_sgw_addr");
     public static final PiActionParamId SMAC = PiActionParamId.of("smac");
+    public static final PiActionParamId CLONE_ID =
+            PiActionParamId.of("clone_id");
     public static final PiActionParamId VLAN_ID = PiActionParamId.of("vlan_id");
     public static final PiActionParamId LABEL = PiActionParamId.of("label");
     public static final PiActionParamId SRC_IP = PiActionParamId.of("src_ip");
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 bca8424..b7ee4c5 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
@@ -42,7 +42,6 @@
 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.
@@ -193,23 +192,12 @@
         if (isNoAction(treatment)) {
             return nop(tableId);
         }
+        treatmentException(
+                tableId, treatment,
+                "unsupported treatment");
 
-        final PortNumber outPort = outputPort(treatment);
-        if (outPort == null
-                || !outPort.equals(PortNumber.CONTROLLER)
-                || treatment.allInstructions().size() > 1) {
-            treatmentException(
-                    tableId, treatment,
-                    "supports only punt/clone to CPU actions");
-        }
-
-        final PiActionId actionId = treatment.clearedDeferred()
-                ? FabricConstants.FABRIC_INGRESS_ACL_PUNT_TO_CPU
-                : FabricConstants.FABRIC_INGRESS_ACL_CLONE_TO_CPU;
-
-        return PiAction.builder()
-                .withId(actionId)
-                .build();
+        // This function will never return null
+        return null;
     }
 
 
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
index 5647d26..066af7d 100644
--- 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
@@ -18,11 +18,14 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableList;
 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.core.ApplicationId;
 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;
@@ -34,7 +37,14 @@
 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.Objective;
 import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.group.DefaultGroupDescription;
+import org.onosproject.net.group.GroupBucket;
+import org.onosproject.net.group.GroupBuckets;
+import org.onosproject.net.group.DefaultGroupKey;
+import org.onosproject.net.group.GroupDescription;
+import org.onosproject.net.group.GroupKey;
 import org.onosproject.net.pi.model.PiActionId;
 import org.onosproject.net.pi.model.PiTableId;
 import org.onosproject.net.pi.runtime.PiAction;
@@ -49,6 +59,9 @@
 
 import static java.lang.String.format;
 import static org.onosproject.pipelines.fabric.FabricUtils.criterionNotNull;
+import static org.onosproject.pipelines.fabric.FabricUtils.outputPort;
+import static org.onosproject.net.group.DefaultGroupBucket.createCloneGroupBucket;
+
 
 /**
  * ObjectiveTranslator implementation ForwardingObjective.
@@ -56,6 +69,8 @@
 class ForwardingObjectiveTranslator
         extends AbstractObjectiveTranslator<ForwardingObjective> {
 
+    //FIXME: Max number supported by PI
+    static final int CLONE_TO_CPU_ID = 511;
     private static final List<String> DEFAULT_ROUTE_PREFIXES = Lists.newArrayList(
             "0.0.0.0/1", "128.0.0.0/1");
 
@@ -245,11 +260,64 @@
     private void aclRule(ForwardingObjective obj,
                          ObjectiveTranslation.Builder resultBuilder)
             throws FabricPipelinerException {
+        if (obj.nextId() == null && obj.treatment() != null) {
+            final TrafficTreatment treatment = obj.treatment();
+            final PortNumber outPort = outputPort(treatment);
+            if (outPort != null
+                    && outPort.equals(PortNumber.CONTROLLER)
+                    && treatment.allInstructions().size() == 1) {
 
+                final PiAction aclAction;
+                if (treatment.clearedDeferred()) {
+                    aclAction = PiAction.builder()
+                            .withId(FabricConstants.FABRIC_INGRESS_ACL_PUNT_TO_CPU)
+                            .build();
+                } else {
+                    // Action is SET_CLONE_SESSION_ID
+                    if (obj.op() == Objective.Operation.ADD) {
+                        // Action is ADD, create clone group
+                        final DefaultGroupDescription cloneGroup =
+                                createCloneGroup(obj.appId(),
+                                                 CLONE_TO_CPU_ID,
+                                                 outPort);
+                        resultBuilder.addGroup(cloneGroup);
+                    }
+                    aclAction = PiAction.builder()
+                            .withId(FabricConstants.FABRIC_INGRESS_ACL_SET_CLONE_SESSION_ID)
+                            .withParameter(new PiActionParam(
+                                    FabricConstants.CLONE_ID, CLONE_TO_CPU_ID))
+                            .build();
+                }
+                final TrafficTreatment piTreatment = DefaultTrafficTreatment.builder()
+                        .piTableAction(aclAction)
+                        .build();
+                resultBuilder.addFlowRule(flowRule(
+                        obj, FabricConstants.FABRIC_INGRESS_ACL_ACL, obj.selector(), piTreatment));
+                return;
+            }
+        }
         resultBuilder.addFlowRule(flowRule(
                 obj, FabricConstants.FABRIC_INGRESS_ACL_ACL, obj.selector()));
     }
 
+    private DefaultGroupDescription createCloneGroup(
+            ApplicationId appId,
+            int cloneSessionId,
+            PortNumber outPort) {
+        final GroupKey groupKey = new DefaultGroupKey(
+                FabricPipeliner.KRYO.serialize(cloneSessionId));
+
+        final List<GroupBucket> bucketList = ImmutableList.of(
+                createCloneGroupBucket(DefaultTrafficTreatment.builder()
+                                               .setOutput(outPort)
+                                               .build()));
+        final DefaultGroupDescription cloneGroup = new DefaultGroupDescription(
+                deviceId, GroupDescription.Type.CLONE,
+                new GroupBuckets(bucketList),
+                groupKey, cloneSessionId, appId);
+        return cloneGroup;
+    }
+
     private FlowRule flowRule(
             ForwardingObjective obj, PiTableId tableId, TrafficSelector selector)
             throws FabricPipelinerException {
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
index 2c2fd77..ec1c64b 100644
--- 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
@@ -436,15 +436,6 @@
                 .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
diff --git a/pipelines/fabric/src/main/resources/bmv2-compile.sh b/pipelines/fabric/src/main/resources/bmv2-compile.sh
index f77e287..d6f0ffa 100755
--- a/pipelines/fabric/src/main/resources/bmv2-compile.sh
+++ b/pipelines/fabric/src/main/resources/bmv2-compile.sh
@@ -17,7 +17,7 @@
 echo
 echo "## Compiling profile ${PROFILE} in ${OUT_DIR}..."
 
-dockerImage=ccasconeonf/p4c
+dockerImage=ccasconeonf/p4c:stable
 dockerRun="docker run --rm -w ${SRC_DIR} -v ${SRC_DIR}:${SRC_DIR} -v ${OUT_DIR}:${OUT_DIR} ${dockerImage}"
 
 # Generate preprocessed P4 source (for debugging).
diff --git a/pipelines/fabric/src/main/resources/include/control/acl.p4 b/pipelines/fabric/src/main/resources/include/control/acl.p4
index dbfd22c..0ab57b5 100644
--- a/pipelines/fabric/src/main/resources/include/control/acl.p4
+++ b/pipelines/fabric/src/main/resources/include/control/acl.p4
@@ -41,9 +41,9 @@
         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;
+    // Set clone session id for a I2E clone session
+    action set_clone_session_id(bit<32> clone_id) {
+        clone3<standard_metadata_t>(CloneType.I2E, clone_id, standard_metadata);
         acl_counter.count();
     }
 
@@ -76,7 +76,7 @@
         actions = {
             set_next_id_acl;
             punt_to_cpu;
-            clone_to_cpu;
+            set_clone_session_id;
             drop;
             nop_acl;
         }
diff --git a/pipelines/fabric/src/main/resources/include/control/packetio.p4 b/pipelines/fabric/src/main/resources/include/control/packetio.p4
index 655f2ab..0adb8f5 100644
--- a/pipelines/fabric/src/main/resources/include/control/packetio.p4
+++ b/pipelines/fabric/src/main/resources/include/control/packetio.p4
@@ -41,11 +41,6 @@
             exit;
         }
         if (standard_metadata.egress_port == CPU_PORT) {
-            if (fabric_metadata.is_multicast == _TRUE &&
-                fabric_metadata.clone_to_cpu == _FALSE) {
-                // Is multicast but clone was not requested.
-                mark_to_drop(standard_metadata);
-            }
             hdr.packet_in.setValid();
             hdr.packet_in.ingress_port = standard_metadata.ingress_port;
             // No need to process through the rest of the pipeline.
diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4
index 5971b38..11204e8 100644
--- a/pipelines/fabric/src/main/resources/include/header.p4
+++ b/pipelines/fabric/src/main/resources/include/header.p4
@@ -178,7 +178,6 @@
     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;
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
index 3fff434..d141c9f 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -24,14 +24,13 @@
         ["fabric_metadata_t._next_id10", 32, false],
         ["fabric_metadata_t._is_multicast11", 1, false],
         ["fabric_metadata_t._is_controller_packet_out12", 1, false],
-        ["fabric_metadata_t._clone_to_cpu13", 1, false],
-        ["fabric_metadata_t._ip_proto14", 8, false],
-        ["fabric_metadata_t._l4_sport15", 16, false],
-        ["fabric_metadata_t._l4_dport16", 16, false],
-        ["fabric_metadata_t._bng_type17", 2, false],
-        ["fabric_metadata_t._bng_line_id18", 32, false],
-        ["fabric_metadata_t._bng_ds_meter_result19", 32, false],
-        ["_padding_0", 2, false]
+        ["fabric_metadata_t._ip_proto13", 8, false],
+        ["fabric_metadata_t._l4_sport14", 16, false],
+        ["fabric_metadata_t._l4_dport15", 16, false],
+        ["fabric_metadata_t._bng_type16", 2, false],
+        ["fabric_metadata_t._bng_line_id17", 32, false],
+        ["fabric_metadata_t._bng_ds_meter_result18", 32, false],
+        ["_padding_0", 3, false]
       ]
     },
     {
@@ -276,7 +275,108 @@
   "header_union_types" : [],
   "header_unions" : [],
   "header_union_stacks" : [],
-  "field_lists" : [],
+  "field_lists" : [
+    {
+      "id" : 1,
+      "name" : "fl",
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 77,
+        "column" : 40,
+        "source_fragment" : "standard_metadata"
+      },
+      "elements" : [
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "clone_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "instance_type"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "drop"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "packet_length"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_timedelta"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "lf_field_list"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "mcast_grp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "resubmit_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_rid"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "checksum_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "parser_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "priority"]
+        }
+      ]
+    }
+  ],
   "errors" : [
     ["NoError", 1],
     ["PacketTooShort", 2],
@@ -634,7 +734,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
                 },
                 {
                   "type" : "field",
@@ -706,7 +806,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -719,7 +819,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -755,7 +855,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -768,7 +868,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -838,7 +938,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/bng.p4",
-        "line" : 176,
+        "line" : 177,
         "column" : 33,
         "source_fragment" : "m_besteff"
       },
@@ -852,7 +952,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/bng.p4",
-        "line" : 177,
+        "line" : 178,
         "column" : 33,
         "source_fragment" : "m_prio"
       },
@@ -904,7 +1004,7 @@
       "id" : 3,
       "source_info" : {
         "filename" : "include/bng.p4",
-        "line" : 174,
+        "line" : 175,
         "column" : 49,
         "source_fragment" : "c_line_rx"
       },
@@ -1282,7 +1382,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             },
             {
               "type" : "runtime_data",
@@ -1389,7 +1489,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             }
           ],
           "source_info" : {
@@ -1411,7 +1511,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type16"]
             },
             {
               "type" : "hexstr",
@@ -1507,7 +1607,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             }
           ],
           "source_info" : {
@@ -1538,7 +1638,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 112,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -1557,7 +1657,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 110,
+            "line" : 112,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -1616,7 +1716,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             }
           ],
           "source_info" : {
@@ -1647,7 +1747,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type16"]
             },
             {
               "type" : "hexstr",
@@ -1666,7 +1766,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             },
             {
               "type" : "runtime_data",
@@ -1675,7 +1775,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 186,
+            "line" : 187,
             "column" : 26,
             "source_fragment" : "= line_id; ..."
           }
@@ -1694,7 +1794,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 187,
+            "line" : 188,
             "column" : 8,
             "source_fragment" : "c_line_rx.count(line_id)"
           }
@@ -1713,7 +1813,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 192,
+            "line" : 193,
             "column" : 22,
             "source_fragment" : "= next_id; ..."
           }
@@ -1742,7 +1842,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 193,
+            "line" : 194,
             "column" : 30,
             "source_fragment" : "= true; ..."
           }
@@ -1764,7 +1864,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type16"]
             },
             {
               "type" : "hexstr",
@@ -1783,7 +1883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             },
             {
               "type" : "runtime_data",
@@ -1792,7 +1892,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 186,
+            "line" : 187,
             "column" : 26,
             "source_fragment" : "= line_id; ..."
           }
@@ -1811,7 +1911,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 187,
+            "line" : 188,
             "column" : 8,
             "source_fragment" : "c_line_rx.count(line_id)"
           }
@@ -1840,7 +1940,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 198,
+            "line" : 199,
             "column" : 30,
             "source_fragment" : "= true; ..."
           }
@@ -1869,7 +1969,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 199,
+            "line" : 200,
             "column" : 24,
             "source_fragment" : "= true; ..."
           }
@@ -1884,7 +1984,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 200,
+            "line" : 201,
             "column" : 8,
             "source_fragment" : "mark_to_drop(smeta)"
           }
@@ -1905,11 +2005,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result19"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result18"]
             }
           ],
           "source_info" : {
@@ -1935,11 +2035,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result19"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result18"]
             }
           ],
           "source_info" : {
@@ -2289,37 +2389,32 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.clone_to_cpu",
+      "name" : "FabricIngress.acl.set_clone_session_id",
       "id" : 28,
-      "runtime_data" : [],
+      "runtime_data" : [
+        {
+          "name" : "clone_id",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
-          "op" : "assign",
+          "op" : "clone_ingress_pkt_to_egress",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
+              "type" : "runtime_data",
+              "value" : 0
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x1"
             }
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 37,
-            "source_fragment" : "= true; ..."
+            "column" : 8,
+            "source_fragment" : "clone3(CloneType.I2E, clone_id, standard_metadata)"
           }
         }
       ]
@@ -2941,7 +3036,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type16"]
             },
             {
               "type" : "hexstr",
@@ -3069,7 +3164,7 @@
           ],
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 155,
+            "line" : 156,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -3292,7 +3387,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 107,
+            "line" : 109,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3345,7 +3440,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 114,
+            "line" : 116,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -3450,7 +3545,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id17"]
             }
           ],
           "source_info" : {
@@ -3516,7 +3611,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 118,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -3674,7 +3769,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 108,
+            "line" : 110,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -3791,7 +3886,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 107,
+            "line" : 109,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -3862,28 +3957,6 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_12",
-      "id" : 58,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -3893,7 +3966,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "line" : 44,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -3912,7 +3985,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 50,
+            "line" : 45,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -3922,7 +3995,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 47,
             "column" : 12,
             "source_fragment" : "exit"
           }
@@ -3930,8 +4003,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 59,
+      "name" : "act_12",
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3952,8 +4025,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 60,
+      "name" : "act_13",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3982,8 +4055,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 61,
+      "name" : "act_14",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4012,8 +4085,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 62,
+      "name" : "act_15",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4034,8 +4107,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 63,
+      "name" : "act_16",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4083,8 +4156,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 64,
+      "name" : "act_17",
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4105,8 +4178,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 65,
+      "name" : "act_18",
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4517,7 +4590,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 155,
+            "line" : 156,
             "column" : 12,
             "source_fragment" : "return"
           },
@@ -4554,7 +4627,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id18"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id17"],
               "mask" : null
             },
             {
@@ -4595,7 +4668,7 @@
           "id" : 12,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 203,
+            "line" : 204,
             "column" : 10,
             "source_fragment" : "t_line_map_v4"
           },
@@ -4686,7 +4759,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id18"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id17"],
               "mask" : null
             },
             {
@@ -4865,19 +4938,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             },
             {
@@ -4936,12 +5009,12 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [26, 27, 28, 29, 30],
-          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "FabricIngress.acl.set_next_id_acl" : "node_35",
             "FabricIngress.acl.punt_to_cpu" : "node_35",
-            "FabricIngress.acl.clone_to_cpu" : "node_35",
+            "FabricIngress.acl.set_clone_session_id" : "node_35",
             "FabricIngress.acl.drop" : "node_35",
             "FabricIngress.acl.nop_acl" : "node_35"
           },
@@ -5187,15 +5260,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
               }
             ]
           }
@@ -5347,7 +5420,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/bng.p4",
-            "line" : 158,
+            "line" : 159,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -5648,9 +5721,9 @@
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
+            "line" : 44,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
           },
           "key" : [],
           "match_type" : "exact",
@@ -5661,9 +5734,9 @@
           "direct_meters" : null,
           "action_ids" : [57],
           "actions" : ["act_11"],
-          "base_default_next" : "tbl_act_12",
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "act_11" : "tbl_act_12"
+            "act_11" : "node_50"
           },
           "default_entry" : {
             "action_id" : 57,
@@ -5676,10 +5749,10 @@
           "name" : "tbl_act_12",
           "id" : 28,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "filename" : "include/control/next.p4",
+            "line" : 308,
             "column" : 12,
-            "source_fragment" : "hdr.packet_in.setValid(); ..."
+            "source_fragment" : "mark_to_drop(standard_metadata)"
           },
           "key" : [],
           "match_type" : "exact",
@@ -5702,37 +5775,8 @@
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 29,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 308,
-            "column" : 12,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_54",
-          "next_tables" : {
-            "act_13" : "node_54"
-          },
-          "default_entry" : {
-            "action_id" : 59,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 30,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -5761,7 +5805,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 31,
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -5790,7 +5834,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 32,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 291,
@@ -5821,8 +5865,8 @@
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_14",
-            "__MISS__" : "tbl_act_15"
+            "__HIT__" : "tbl_act_13",
+            "__MISS__" : "tbl_act_14"
           },
           "default_entry" : {
             "action_id" : 50,
@@ -5832,6 +5876,29 @@
           }
         },
         {
+          "name" : "tbl_act_13",
+          "id" : 32,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [59],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_59",
+          "next_tables" : {
+            "act_13" : "node_59"
+          },
+          "default_entry" : {
+            "action_id" : 59,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_14",
           "id" : 33,
           "key" : [],
@@ -5843,9 +5910,9 @@
           "direct_meters" : null,
           "action_ids" : [60],
           "actions" : ["act_14"],
-          "base_default_next" : "node_61",
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "act_14" : "node_61"
+            "act_14" : "node_59"
           },
           "default_entry" : {
             "action_id" : 60,
@@ -5855,31 +5922,8 @@
           }
         },
         {
-          "name" : "tbl_act_15",
-          "id" : 34,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_61",
-          "next_tables" : {
-            "act_15" : "node_61"
-          },
-          "default_entry" : {
-            "action_id" : 61,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 35,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -5895,9 +5939,9 @@
           "direct_meters" : null,
           "action_ids" : [54],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_64",
+          "base_default_next" : "node_62",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_64"
+            "FabricEgress.egress_next.push_vlan" : "node_62"
           },
           "default_entry" : {
             "action_id" : 54,
@@ -5907,8 +5951,8 @@
           }
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 36,
+          "name" : "tbl_act_15",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 326,
@@ -5922,22 +5966,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_66",
+          "action_ids" : [62],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_64",
           "next_tables" : {
-            "act_17" : "node_66"
+            "act_16" : "node_64"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 37,
+          "name" : "tbl_act_16",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -5951,22 +5995,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62],
-          "actions" : ["act_16"],
-          "base_default_next" : "node_72",
+          "action_ids" : [61],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "act_16" : "node_72"
+            "act_15" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 38,
+          "name" : "tbl_act_17",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 330,
@@ -5980,22 +6024,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_70",
+          "action_ids" : [64],
+          "actions" : ["act_18"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_19" : "node_70"
+            "act_18" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 65,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 39,
+          "name" : "tbl_act_18",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -6009,14 +6053,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_72",
+          "action_ids" : [63],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "act_18" : "node_72"
+            "act_17" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6024,7 +6068,7 @@
         },
         {
           "name" : "FabricEgress.bng_egress.downstream.t_session_encap",
-          "id" : 40,
+          "id" : 39,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 337,
@@ -6035,7 +6079,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id18"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id17"],
               "mask" : null
             }
           ],
@@ -6118,72 +6162,12 @@
               }
             }
           },
-          "true_next" : "node_49",
-          "false_next" : "node_52"
-        },
-        {
-          "name" : "node_49",
-          "id" : 18,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 44,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.is_multicast == true && ..."
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          },
           "true_next" : "tbl_act_11",
-          "false_next" : "tbl_act_12"
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_52",
-          "id" : 19,
+          "name" : "node_50",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 306,
@@ -6231,12 +6215,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_54"
+          "true_next" : "tbl_act_12",
+          "false_next" : "node_52"
         },
         {
-          "name" : "node_54",
-          "id" : 20,
+          "name" : "node_52",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 311,
@@ -6257,12 +6241,12 @@
               }
             }
           },
-          "true_next" : "node_55",
+          "true_next" : "node_53",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_55",
-          "id" : 21,
+          "name" : "node_53",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -6284,8 +6268,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_61",
-          "id" : 22,
+          "name" : "node_59",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -6310,12 +6294,12 @@
               }
             }
           },
-          "true_next" : "node_62",
-          "false_next" : "node_64"
+          "true_next" : "node_60",
+          "false_next" : "node_62"
         },
         {
-          "name" : "node_62",
-          "id" : 23,
+          "name" : "node_60",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -6337,11 +6321,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_64"
+          "false_next" : "node_62"
         },
         {
-          "name" : "node_64",
-          "id" : 24,
+          "name" : "node_62",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 325,
@@ -6359,12 +6343,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "node_68"
+          "true_next" : "tbl_act_15",
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_66",
-          "id" : 25,
+          "name" : "node_64",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -6385,12 +6369,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "node_72"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_70"
         },
         {
-          "name" : "node_68",
-          "id" : 26,
+          "name" : "node_66",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 329,
@@ -6408,12 +6392,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_18",
-          "false_next" : "node_72"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_70"
         },
         {
-          "name" : "node_70",
-          "id" : 27,
+          "name" : "node_68",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -6434,12 +6418,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_72"
+          "true_next" : "tbl_act_18",
+          "false_next" : "node_70"
         },
         {
-          "name" : "node_72",
-          "id" : 28,
+          "name" : "node_70",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 386,
@@ -6452,7 +6436,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+                "value" : ["scalars", "fabric_metadata_t._bng_type16"]
               },
               "right" : {
                 "type" : "hexstr",
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
index a9885e2..e6f3866 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
@@ -393,7 +393,7 @@
     id: 16829684
   }
   action_refs {
-    id: 16790975
+    id: 16781601
   }
   action_refs {
     id: 16820765
@@ -755,9 +755,14 @@
 }
 actions {
   preamble {
-    id: 16790975
-    name: "FabricIngress.acl.clone_to_cpu"
-    alias: "clone_to_cpu"
+    id: 16781601
+    name: "FabricIngress.acl.set_clone_session_id"
+    alias: "set_clone_session_id"
+  }
+  params {
+    id: 1
+    name: "clone_id"
+    bitwidth: 32
   }
 }
 actions {
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 08b9395..fae668a 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
@@ -35,27 +35,26 @@
         ["fabric_metadata_t._next_id10", 32, false],
         ["fabric_metadata_t._is_multicast11", 1, false],
         ["fabric_metadata_t._is_controller_packet_out12", 1, false],
-        ["fabric_metadata_t._clone_to_cpu13", 1, false],
-        ["fabric_metadata_t._ip_proto14", 8, false],
-        ["fabric_metadata_t._l4_sport15", 16, false],
-        ["fabric_metadata_t._l4_dport16", 16, false],
-        ["fabric_metadata_t._spgw_direction17", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
-        ["fabric_metadata_t._spgw_teid19", 32, false],
-        ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
-        ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
-        ["fabric_metadata_t._bng_type22", 2, false],
-        ["fabric_metadata_t._bng_line_id23", 32, false],
-        ["fabric_metadata_t._bng_ds_meter_result24", 32, false],
-        ["fabric_metadata_t._int_meta_source25", 1, false],
-        ["fabric_metadata_t._int_meta_transit26", 1, false],
-        ["fabric_metadata_t._int_meta_sink27", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id28", 32, false],
-        ["fabric_metadata_t._int_meta_new_words29", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes30", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp31", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp32", 32, false],
-        ["_padding_0", 1, false]
+        ["fabric_metadata_t._ip_proto13", 8, false],
+        ["fabric_metadata_t._l4_sport14", 16, false],
+        ["fabric_metadata_t._l4_dport15", 16, false],
+        ["fabric_metadata_t._spgw_direction16", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len17", 16, false],
+        ["fabric_metadata_t._spgw_teid18", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr19", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr20", 32, false],
+        ["fabric_metadata_t._bng_type21", 2, false],
+        ["fabric_metadata_t._bng_line_id22", 32, false],
+        ["fabric_metadata_t._bng_ds_meter_result23", 32, false],
+        ["fabric_metadata_t._int_meta_source24", 1, false],
+        ["fabric_metadata_t._int_meta_transit25", 1, false],
+        ["fabric_metadata_t._int_meta_sink26", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id27", 32, false],
+        ["fabric_metadata_t._int_meta_new_words28", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes29", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp30", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp31", 32, false],
+        ["_padding_0", 2, false]
       ]
     },
     {
@@ -608,6 +607,106 @@
     {
       "id" : 1,
       "name" : "fl",
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 77,
+        "column" : 40,
+        "source_fragment" : "standard_metadata"
+      },
+      "elements" : [
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "clone_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "instance_type"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "drop"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "packet_length"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_timedelta"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "lf_field_list"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "mcast_grp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "resubmit_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_rid"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "checksum_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "parser_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "priority"]
+        }
+      ]
+    },
+    {
+      "id" : 2,
+      "name" : "fl_0",
       "elements" : []
     }
   ],
@@ -1012,7 +1111,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
                 },
                 {
                   "type" : "field",
@@ -1097,7 +1196,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
                 },
                 {
                   "type" : "field",
@@ -1169,7 +1268,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -1182,7 +1281,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -1218,7 +1317,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -1231,7 +1330,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -1440,7 +1539,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -1453,7 +1552,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -2360,7 +2459,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid18"]
             },
             {
               "type" : "runtime_data",
@@ -2379,7 +2478,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr19"]
             },
             {
               "type" : "runtime_data",
@@ -2398,7 +2497,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -2429,7 +2528,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "runtime_data",
@@ -2536,7 +2635,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -2558,7 +2657,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -2654,7 +2753,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -2676,7 +2775,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -2772,7 +2871,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -2881,7 +2980,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -2990,7 +3089,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -3021,7 +3120,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -3040,7 +3139,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "runtime_data",
@@ -3142,7 +3241,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -3161,7 +3260,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "runtime_data",
@@ -3259,7 +3358,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -3278,7 +3377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "runtime_data",
@@ -3401,7 +3500,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -3420,7 +3519,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "runtime_data",
@@ -3542,11 +3641,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result23"]
             }
           ],
           "source_info" : {
@@ -3572,11 +3671,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result23"]
             }
           ],
           "source_info" : {
@@ -3602,11 +3701,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result23"]
             }
           ],
           "source_info" : {
@@ -3632,11 +3731,11 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result23"]
             }
           ],
           "source_info" : {
@@ -3658,7 +3757,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source24"]
             },
             {
               "type" : "expression",
@@ -3694,7 +3793,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink26"]
             },
             {
               "type" : "expression",
@@ -4089,37 +4188,32 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.clone_to_cpu",
+      "name" : "FabricIngress.acl.set_clone_session_id",
       "id" : 46,
-      "runtime_data" : [],
+      "runtime_data" : [
+        {
+          "name" : "clone_id",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
-          "op" : "assign",
+          "op" : "clone_ingress_pkt_to_egress",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
+              "type" : "runtime_data",
+              "value" : 0
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x1"
             }
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 37,
-            "source_fragment" : "= true; ..."
+            "column" : 8,
+            "source_fragment" : "clone3<standard_metadata_t>(CloneType.I2E, clone_id, standard_metadata)"
           }
         }
       ]
@@ -5239,7 +5333,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -5325,7 +5419,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -5351,7 +5445,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -5436,7 +5530,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
             },
             {
               "type" : "field",
@@ -5462,7 +5556,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              "value" : ["scalars", "fabric_metadata_t._bng_type21"]
             },
             {
               "type" : "hexstr",
@@ -5965,7 +6059,7 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x1"
+              "value" : "0x2"
             }
           ],
           "source_info" : {
@@ -6261,7 +6355,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr19"]
             }
           ],
           "source_info" : {
@@ -6280,7 +6374,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr20"]
             }
           ],
           "source_info" : {
@@ -6381,7 +6475,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6580,7 +6674,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
             }
           ],
           "source_info" : {
@@ -6599,7 +6693,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid18"]
             }
           ],
           "source_info" : {
@@ -6797,7 +6891,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -7056,7 +7150,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id22"]
             }
           ],
           "source_info" : {
@@ -7490,7 +7584,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
             }
           ],
           "source_info" : {
@@ -7639,7 +7733,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit25"]
             },
             {
               "type" : "expression",
@@ -7668,7 +7762,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             },
             {
               "type" : "runtime_data",
@@ -7766,7 +7860,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -7780,7 +7874,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7808,7 +7902,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -7822,7 +7916,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7891,7 +7985,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -7905,7 +7999,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7933,7 +8027,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -7947,7 +8041,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8082,7 +8176,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -8096,7 +8190,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8124,7 +8218,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -8138,7 +8232,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8252,7 +8346,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -8266,7 +8360,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8294,7 +8388,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -8308,7 +8402,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8488,7 +8582,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -8502,7 +8596,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8530,7 +8624,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -8544,7 +8638,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8692,7 +8786,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -8706,7 +8800,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8734,7 +8828,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -8748,7 +8842,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8962,7 +9056,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -8976,7 +9070,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9004,7 +9098,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -9018,7 +9112,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9072,7 +9166,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -9087,7 +9181,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -9101,7 +9195,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9129,7 +9223,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -9143,7 +9237,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9263,7 +9357,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -9278,7 +9372,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -9292,7 +9386,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9320,7 +9414,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -9334,7 +9428,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9422,7 +9516,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -9437,7 +9531,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -9451,7 +9545,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9479,7 +9573,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -9493,7 +9587,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9647,7 +9741,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -9662,7 +9756,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -9676,7 +9770,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9704,7 +9798,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -9718,7 +9812,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9851,7 +9945,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -9866,7 +9960,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -9880,7 +9974,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9908,7 +10002,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -9922,7 +10016,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10121,7 +10215,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -10136,7 +10230,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -10150,7 +10244,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10178,7 +10272,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -10192,7 +10286,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10359,7 +10453,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -10374,7 +10468,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -10388,7 +10482,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10416,7 +10510,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -10430,7 +10524,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10663,7 +10757,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id27"]
             }
           ],
           "source_info" : {
@@ -10678,7 +10772,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -10692,7 +10786,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10720,7 +10814,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -10734,7 +10828,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10809,7 +10903,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -10823,7 +10917,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10851,7 +10945,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -10865,7 +10959,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10953,7 +11047,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -10967,7 +11061,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10995,7 +11089,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -11009,7 +11103,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11131,7 +11225,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -11145,7 +11239,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11173,7 +11267,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -11187,7 +11281,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11279,7 +11373,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -11293,7 +11387,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11321,7 +11415,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -11335,7 +11429,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11461,7 +11555,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -11475,7 +11569,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11503,7 +11597,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -11517,7 +11611,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11662,7 +11756,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -11676,7 +11770,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11704,7 +11798,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -11718,7 +11812,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11897,7 +11991,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -11911,7 +12005,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11939,7 +12033,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -11953,7 +12047,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12022,7 +12116,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -12036,7 +12130,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12064,7 +12158,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -12078,7 +12172,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12181,7 +12275,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -12195,7 +12289,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12223,7 +12317,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -12237,7 +12331,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12359,7 +12453,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -12373,7 +12467,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12401,7 +12495,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -12415,7 +12509,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12571,7 +12665,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -12585,7 +12679,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12613,7 +12707,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -12627,7 +12721,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12753,7 +12847,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -12767,7 +12861,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12795,7 +12889,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -12809,7 +12903,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -12969,7 +13063,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -12983,7 +13077,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13011,7 +13105,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -13025,7 +13119,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13204,7 +13298,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -13218,7 +13312,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13246,7 +13340,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -13260,7 +13354,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13473,7 +13567,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
             },
             {
               "type" : "expression",
@@ -13487,7 +13581,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -13515,7 +13609,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
             },
             {
               "type" : "expression",
@@ -13529,7 +13623,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -14916,28 +15010,6 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_32",
-      "id" : 143,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -14947,7 +15019,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "line" : 44,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -14966,7 +15038,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 50,
+            "line" : 45,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -14976,7 +15048,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 47,
             "column" : 12,
             "source_fragment" : "exit"
           }
@@ -14984,8 +15056,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 144,
+      "name" : "act_32",
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15006,8 +15078,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 145,
+      "name" : "act_33",
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15036,8 +15108,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 146,
+      "name" : "act_34",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15066,8 +15138,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 147,
+      "name" : "act_35",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15088,8 +15160,8 @@
       ]
     },
     {
-      "name" : "act_37",
-      "id" : 148,
+      "name" : "act_36",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15137,8 +15209,8 @@
       ]
     },
     {
-      "name" : "act_38",
-      "id" : 149,
+      "name" : "act_37",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15159,8 +15231,8 @@
       ]
     },
     {
-      "name" : "act_39",
-      "id" : 150,
+      "name" : "act_38",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15208,8 +15280,8 @@
       ]
     },
     {
-      "name" : "act_40",
-      "id" : 151,
+      "name" : "act_39",
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15230,8 +15302,8 @@
       ]
     },
     {
-      "name" : "act_41",
-      "id" : 152,
+      "name" : "act_40",
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15279,8 +15351,8 @@
       ]
     },
     {
-      "name" : "act_42",
-      "id" : 153,
+      "name" : "act_41",
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15309,8 +15381,8 @@
       ]
     },
     {
-      "name" : "act_43",
-      "id" : 154,
+      "name" : "act_42",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15345,8 +15417,8 @@
       ]
     },
     {
-      "name" : "act_44",
-      "id" : 155,
+      "name" : "act_43",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15372,7 +15444,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       }
                     }
                   },
@@ -15394,8 +15466,8 @@
       ]
     },
     {
-      "name" : "act_45",
-      "id" : 156,
+      "name" : "act_44",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15443,8 +15515,8 @@
       ]
     },
     {
-      "name" : "act_46",
-      "id" : 157,
+      "name" : "act_45",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15470,7 +15542,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes29"]
                       }
                     }
                   },
@@ -15492,8 +15564,8 @@
       ]
     },
     {
-      "name" : "act_47",
-      "id" : 158,
+      "name" : "act_46",
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -15519,7 +15591,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words28"]
                       }
                     }
                   },
@@ -16449,7 +16521,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
               "mask" : null
             },
             {
@@ -16527,7 +16599,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
               "mask" : null
             },
             {
@@ -16659,7 +16731,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
               "mask" : null
             },
             {
@@ -16826,7 +16898,7 @@
             {
               "match_type" : "ternary",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
               "mask" : null
             },
             {
@@ -17036,19 +17108,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             },
             {
@@ -17107,12 +17179,12 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [44, 45, 46, 47, 48],
-          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_72",
           "next_tables" : {
             "FabricIngress.acl.set_next_id_acl" : "node_72",
             "FabricIngress.acl.punt_to_cpu" : "node_72",
-            "FabricIngress.acl.clone_to_cpu" : "node_72",
+            "FabricIngress.acl.set_clone_session_id" : "node_72",
             "FabricIngress.acl.drop" : "node_72",
             "FabricIngress.acl.nop_acl" : "node_72"
           },
@@ -17500,15 +17572,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
               }
             ]
           }
@@ -18194,7 +18266,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink27"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink26"]
                   }
                 }
               },
@@ -18254,9 +18326,9 @@
           "id" : 57,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
+            "line" : 44,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
           },
           "key" : [],
           "match_type" : "exact",
@@ -18267,9 +18339,9 @@
           "direct_meters" : null,
           "action_ids" : [142],
           "actions" : ["act_31"],
-          "base_default_next" : "tbl_act_32",
+          "base_default_next" : "node_92",
           "next_tables" : {
-            "act_31" : "tbl_act_32"
+            "act_31" : "node_92"
           },
           "default_entry" : {
             "action_id" : 142,
@@ -18282,10 +18354,10 @@
           "name" : "tbl_act_32",
           "id" : 58,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "filename" : "include/control/next.p4",
+            "line" : 308,
             "column" : 12,
-            "source_fragment" : "hdr.packet_in.setValid(); ..."
+            "source_fragment" : "mark_to_drop(standard_metadata)"
           },
           "key" : [],
           "match_type" : "exact",
@@ -18308,37 +18380,8 @@
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 59,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 308,
-            "column" : 12,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [144],
-          "actions" : ["act_33"],
-          "base_default_next" : "node_96",
-          "next_tables" : {
-            "act_33" : "node_96"
-          },
-          "default_entry" : {
-            "action_id" : 144,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 60,
+          "id" : 59,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -18367,7 +18410,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 61,
+          "id" : 60,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -18396,7 +18439,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 62,
+          "id" : 61,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 291,
@@ -18427,8 +18470,8 @@
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_34",
-            "__MISS__" : "tbl_act_35"
+            "__HIT__" : "tbl_act_33",
+            "__MISS__" : "tbl_act_34"
           },
           "default_entry" : {
             "action_id" : 94,
@@ -18438,6 +18481,29 @@
           }
         },
         {
+          "name" : "tbl_act_33",
+          "id" : 62,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [144],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_101",
+          "next_tables" : {
+            "act_33" : "node_101"
+          },
+          "default_entry" : {
+            "action_id" : 144,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_34",
           "id" : 63,
           "key" : [],
@@ -18449,9 +18515,9 @@
           "direct_meters" : null,
           "action_ids" : [145],
           "actions" : ["act_34"],
-          "base_default_next" : "node_103",
+          "base_default_next" : "node_101",
           "next_tables" : {
-            "act_34" : "node_103"
+            "act_34" : "node_101"
           },
           "default_entry" : {
             "action_id" : 145,
@@ -18461,31 +18527,8 @@
           }
         },
         {
-          "name" : "tbl_act_35",
-          "id" : 64,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [146],
-          "actions" : ["act_35"],
-          "base_default_next" : "node_103",
-          "next_tables" : {
-            "act_35" : "node_103"
-          },
-          "default_entry" : {
-            "action_id" : 146,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 65,
+          "id" : 64,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -18501,9 +18544,9 @@
           "direct_meters" : null,
           "action_ids" : [139],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_106",
+          "base_default_next" : "node_104",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_106"
+            "FabricEgress.egress_next.push_vlan" : "node_104"
           },
           "default_entry" : {
             "action_id" : 139,
@@ -18513,8 +18556,8 @@
           }
         },
         {
-          "name" : "tbl_act_36",
-          "id" : 66,
+          "name" : "tbl_act_35",
+          "id" : 65,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 326,
@@ -18528,22 +18571,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [148],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_108",
+          "action_ids" : [147],
+          "actions" : ["act_36"],
+          "base_default_next" : "node_106",
           "next_tables" : {
-            "act_37" : "node_108"
+            "act_36" : "node_106"
           },
           "default_entry" : {
-            "action_id" : 148,
+            "action_id" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_37",
-          "id" : 67,
+          "name" : "tbl_act_36",
+          "id" : 66,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -18557,22 +18600,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [147],
-          "actions" : ["act_36"],
-          "base_default_next" : "node_118",
+          "action_ids" : [146],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "act_36" : "node_118"
+            "act_35" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 147,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_38",
-          "id" : 68,
+          "name" : "tbl_act_37",
+          "id" : 67,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 330,
@@ -18586,22 +18629,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [150],
-          "actions" : ["act_39"],
-          "base_default_next" : "node_112",
+          "action_ids" : [149],
+          "actions" : ["act_38"],
+          "base_default_next" : "node_110",
           "next_tables" : {
-            "act_39" : "node_112"
+            "act_38" : "node_110"
           },
           "default_entry" : {
-            "action_id" : 150,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_39",
-          "id" : 69,
+          "name" : "tbl_act_38",
+          "id" : 68,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -18615,22 +18658,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [149],
-          "actions" : ["act_38"],
-          "base_default_next" : "node_118",
+          "action_ids" : [148],
+          "actions" : ["act_37"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "act_38" : "node_118"
+            "act_37" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 149,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_40",
-          "id" : 70,
+          "name" : "tbl_act_39",
+          "id" : 69,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 335,
@@ -18644,22 +18687,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [152],
-          "actions" : ["act_41"],
-          "base_default_next" : "node_116",
+          "action_ids" : [151],
+          "actions" : ["act_40"],
+          "base_default_next" : "node_114",
           "next_tables" : {
-            "act_41" : "node_116"
+            "act_40" : "node_114"
           },
           "default_entry" : {
-            "action_id" : 152,
+            "action_id" : 151,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_41",
-          "id" : 71,
+          "name" : "tbl_act_40",
+          "id" : 70,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 336,
@@ -18673,14 +18716,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [151],
-          "actions" : ["act_40"],
-          "base_default_next" : "node_118",
+          "action_ids" : [150],
+          "actions" : ["act_39"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "act_40" : "node_118"
+            "act_39" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 151,
+            "action_id" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18688,7 +18731,7 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 72,
+          "id" : 71,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 228,
@@ -18704,9 +18747,9 @@
           "direct_meters" : null,
           "action_ids" : [97],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_120",
+          "base_default_next" : "node_118",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_120"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_118"
           },
           "default_entry" : {
             "action_id" : 97,
@@ -18717,7 +18760,7 @@
         },
         {
           "name" : "FabricEgress.bng_egress.downstream.t_session_encap",
-          "id" : 73,
+          "id" : 72,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 336,
@@ -18728,7 +18771,7 @@
             {
               "match_type" : "exact",
               "name" : "line_id",
-              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id22"],
               "mask" : null
             }
           ],
@@ -18740,11 +18783,11 @@
           "direct_meters" : null,
           "action_ids" : [90, 98, 99],
           "actions" : ["nop", "FabricEgress.bng_egress.downstream.encap_v4", "FabricEgress.bng_egress.downstream.encap_v6"],
-          "base_default_next" : "node_122",
+          "base_default_next" : "node_120",
           "next_tables" : {
-            "nop" : "node_122",
-            "FabricEgress.bng_egress.downstream.encap_v4" : "node_122",
-            "FabricEgress.bng_egress.downstream.encap_v6" : "node_122"
+            "nop" : "node_120",
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_120",
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_120"
           },
           "default_entry" : {
             "action_id" : 90,
@@ -18755,7 +18798,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 74,
+          "id" : 73,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -18778,13 +18821,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             }
           ],
@@ -18796,10 +18839,10 @@
           "direct_meters" : null,
           "action_ids" : [100, 91],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_125",
+          "base_default_next" : "node_123",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_125",
-            "nop" : "node_125"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_123",
+            "nop" : "node_123"
           },
           "default_entry" : {
             "action_id" : 91,
@@ -18809,8 +18852,8 @@
           }
         },
         {
-          "name" : "tbl_act_42",
-          "id" : 75,
+          "name" : "tbl_act_41",
+          "id" : 74,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -18818,14 +18861,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [153],
-          "actions" : ["act_42"],
+          "action_ids" : [152],
+          "actions" : ["act_41"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_42" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_41" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 153,
+            "action_id" : 152,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18833,7 +18876,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 76,
+          "id" : 75,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -18856,10 +18899,10 @@
           "direct_meters" : null,
           "action_ids" : [101, 92],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_128",
+          "base_default_next" : "node_126",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_128",
-            "nop" : "node_128"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_126",
+            "nop" : "node_126"
           },
           "default_entry" : {
             "action_id" : 92,
@@ -18869,8 +18912,8 @@
           }
         },
         {
-          "name" : "tbl_act_43",
-          "id" : 77,
+          "name" : "tbl_act_42",
+          "id" : 76,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -18884,14 +18927,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [154],
-          "actions" : ["act_43"],
-          "base_default_next" : "node_130",
+          "action_ids" : [153],
+          "actions" : ["act_42"],
+          "base_default_next" : "node_128",
           "next_tables" : {
-            "act_43" : "node_130"
+            "act_42" : "node_128"
           },
           "default_entry" : {
-            "action_id" : 154,
+            "action_id" : 153,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -18899,7 +18942,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 78,
+          "id" : 77,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -19257,7 +19300,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 79,
+          "id" : 78,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -19280,25 +19323,25 @@
           "direct_meters" : null,
           "action_ids" : [118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 96],
           "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_44",
+          "base_default_next" : "tbl_act_43",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_44",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_44",
-            "NoAction" : "tbl_act_44"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_43",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_43",
+            "NoAction" : "tbl_act_43"
           },
           "default_entry" : {
             "action_id" : 96,
@@ -19614,8 +19657,8 @@
           ]
         },
         {
-          "name" : "tbl_act_44",
-          "id" : 80,
+          "name" : "tbl_act_43",
+          "id" : 79,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -19629,22 +19672,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [156],
-          "actions" : ["act_45"],
-          "base_default_next" : "node_134",
+          "action_ids" : [155],
+          "actions" : ["act_44"],
+          "base_default_next" : "node_132",
           "next_tables" : {
-            "act_45" : "node_134"
+            "act_44" : "node_132"
           },
           "default_entry" : {
-            "action_id" : 156,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_45",
-          "id" : 81,
+          "name" : "tbl_act_44",
+          "id" : 80,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -19658,14 +19701,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [155],
-          "actions" : ["act_44"],
-          "base_default_next" : "node_136",
+          "action_ids" : [154],
+          "actions" : ["act_43"],
+          "base_default_next" : "node_134",
           "next_tables" : {
-            "act_44" : "node_136"
+            "act_43" : "node_134"
           },
           "default_entry" : {
-            "action_id" : 155,
+            "action_id" : 154,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_45",
+          "id" : 81,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 431,
+            "column" : 24,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [156],
+          "actions" : ["act_45"],
+          "base_default_next" : "node_136",
+          "next_tables" : {
+            "act_45" : "node_136"
+          },
+          "default_entry" : {
+            "action_id" : 156,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -19676,8 +19748,8 @@
           "id" : 82,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 431,
-            "column" : 24,
+            "line" : 434,
+            "column" : 37,
             "source_fragment" : "="
           },
           "key" : [],
@@ -19701,37 +19773,8 @@
           }
         },
         {
-          "name" : "tbl_act_47",
-          "id" : 83,
-          "source_info" : {
-            "filename" : "include/int/int_transit.p4",
-            "line" : 434,
-            "column" : 37,
-            "source_fragment" : "="
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [158],
-          "actions" : ["act_47"],
-          "base_default_next" : "node_140",
-          "next_tables" : {
-            "act_47" : "node_140"
-          },
-          "default_entry" : {
-            "action_id" : 158,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 84,
+          "id" : 83,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 86,
@@ -19747,10 +19790,10 @@
           "direct_meters" : null,
           "action_ids" : [134, 93],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_142",
+          "base_default_next" : "node_140",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_142",
-            "nop" : "node_142"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_140",
+            "nop" : "node_140"
           },
           "default_entry" : {
             "action_id" : 93,
@@ -19761,7 +19804,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 85,
+          "id" : 84,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -19790,7 +19833,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 86,
+          "id" : 85,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -19876,72 +19919,12 @@
               }
             }
           },
-          "true_next" : "node_91",
-          "false_next" : "node_94"
-        },
-        {
-          "name" : "node_91",
-          "id" : 30,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 44,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.is_multicast == true && ..."
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          },
           "true_next" : "tbl_act_31",
-          "false_next" : "tbl_act_32"
+          "false_next" : "node_92"
         },
         {
-          "name" : "node_94",
-          "id" : 31,
+          "name" : "node_92",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 306,
@@ -19989,12 +19972,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_96"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_94"
         },
         {
-          "name" : "node_96",
-          "id" : 32,
+          "name" : "node_94",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 311,
@@ -20015,12 +19998,12 @@
               }
             }
           },
-          "true_next" : "node_97",
+          "true_next" : "node_95",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_97",
-          "id" : 33,
+          "name" : "node_95",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -20042,8 +20025,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_103",
-          "id" : 34,
+          "name" : "node_101",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -20068,12 +20051,12 @@
               }
             }
           },
-          "true_next" : "node_104",
-          "false_next" : "node_106"
+          "true_next" : "node_102",
+          "false_next" : "node_104"
         },
         {
-          "name" : "node_104",
-          "id" : 35,
+          "name" : "node_102",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -20095,11 +20078,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_106"
+          "false_next" : "node_104"
         },
         {
-          "name" : "node_106",
-          "id" : 36,
+          "name" : "node_104",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 325,
@@ -20117,12 +20100,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_36",
-          "false_next" : "node_110"
+          "true_next" : "tbl_act_35",
+          "false_next" : "node_108"
         },
         {
-          "name" : "node_108",
-          "id" : 37,
+          "name" : "node_106",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -20143,12 +20126,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_118"
+          "true_next" : "tbl_act_36",
+          "false_next" : "node_116"
         },
         {
-          "name" : "node_110",
-          "id" : 38,
+          "name" : "node_108",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 329,
@@ -20166,12 +20149,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_38",
-          "false_next" : "node_114"
+          "true_next" : "tbl_act_37",
+          "false_next" : "node_112"
         },
         {
-          "name" : "node_112",
-          "id" : 39,
+          "name" : "node_110",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -20192,12 +20175,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_39",
-          "false_next" : "node_118"
+          "true_next" : "tbl_act_38",
+          "false_next" : "node_116"
         },
         {
-          "name" : "node_114",
-          "id" : 40,
+          "name" : "node_112",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 334,
@@ -20215,12 +20198,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_40",
-          "false_next" : "node_118"
+          "true_next" : "tbl_act_39",
+          "false_next" : "node_116"
         },
         {
-          "name" : "node_116",
-          "id" : 41,
+          "name" : "node_114",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 336,
@@ -20241,12 +20224,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_41",
-          "false_next" : "node_118"
+          "true_next" : "tbl_act_40",
+          "false_next" : "node_116"
         },
         {
-          "name" : "node_118",
-          "id" : 42,
+          "name" : "node_116",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 227,
@@ -20259,7 +20242,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -20268,11 +20251,11 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_120"
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_120",
-          "id" : 43,
+          "name" : "node_118",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/bng.p4",
             "line" : 385,
@@ -20285,7 +20268,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+                "value" : ["scalars", "fabric_metadata_t._bng_type21"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -20294,11 +20277,11 @@
             }
           },
           "true_next" : "FabricEgress.bng_egress.downstream.t_session_encap",
-          "false_next" : "node_122"
+          "false_next" : "node_120"
         },
         {
-          "name" : "node_122",
-          "id" : 44,
+          "name" : "node_120",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -20374,11 +20357,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_123"
+          "true_next" : "node_121"
         },
         {
-          "name" : "node_123",
-          "id" : 45,
+          "name" : "node_121",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 106,
@@ -20396,7 +20379,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source25"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source24"]
                   }
                 }
               },
@@ -20407,11 +20390,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_125"
+          "false_next" : "node_123"
         },
         {
-          "name" : "node_125",
-          "id" : 46,
+          "name" : "node_123",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -20430,11 +20413,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_42"
+          "true_next" : "tbl_act_41"
         },
         {
-          "name" : "node_128",
-          "id" : 47,
+          "name" : "node_126",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -20452,7 +20435,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit26"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit25"]
                   }
                 }
               },
@@ -20462,12 +20445,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_43",
-          "false_next" : "node_130"
+          "true_next" : "tbl_act_42",
+          "false_next" : "node_128"
         },
         {
-          "name" : "node_130",
-          "id" : 48,
+          "name" : "node_128",
+          "id" : 47,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -20487,11 +20470,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_140"
+          "false_next" : "node_138"
         },
         {
-          "name" : "node_134",
-          "id" : 49,
+          "name" : "node_132",
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -20509,12 +20492,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_45",
-          "false_next" : "node_136"
+          "true_next" : "tbl_act_44",
+          "false_next" : "node_134"
         },
         {
-          "name" : "node_136",
-          "id" : 50,
+          "name" : "node_134",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -20532,12 +20515,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_46",
-          "false_next" : "node_138"
+          "true_next" : "tbl_act_45",
+          "false_next" : "node_136"
         },
         {
-          "name" : "node_138",
-          "id" : 51,
+          "name" : "node_136",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -20555,12 +20538,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_47",
-          "false_next" : "node_140"
+          "true_next" : "tbl_act_46",
+          "false_next" : "node_138"
         },
         {
-          "name" : "node_140",
-          "id" : 52,
+          "name" : "node_138",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 115,
@@ -20582,11 +20565,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_142"
+          "false_next" : "node_140"
         },
         {
-          "name" : "node_142",
-          "id" : 53,
+          "name" : "node_140",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 119,
@@ -20604,7 +20587,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink27"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink26"]
                   }
                 }
               },
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 eaff419..c3e7b90 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
@@ -601,7 +601,7 @@
     id: 16829684
   }
   action_refs {
-    id: 16790975
+    id: 16781601
   }
   action_refs {
     id: 16820765
@@ -1132,9 +1132,14 @@
 }
 actions {
   preamble {
-    id: 16790975
-    name: "FabricIngress.acl.clone_to_cpu"
-    alias: "clone_to_cpu"
+    id: 16781601
+    name: "FabricIngress.acl.set_clone_session_id"
+    alias: "set_clone_session_id"
+  }
+  params {
+    id: 1
+    name: "clone_id"
+    bitwidth: 32
   }
 }
 actions {
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 687353a..e736f5d 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
@@ -23,19 +23,18 @@
         ["fabric_metadata_t._next_id10", 32, false],
         ["fabric_metadata_t._is_multicast11", 1, false],
         ["fabric_metadata_t._is_controller_packet_out12", 1, false],
-        ["fabric_metadata_t._clone_to_cpu13", 1, false],
-        ["fabric_metadata_t._ip_proto14", 8, false],
-        ["fabric_metadata_t._l4_sport15", 16, false],
-        ["fabric_metadata_t._l4_dport16", 16, false],
-        ["fabric_metadata_t._int_meta_source17", 1, false],
-        ["fabric_metadata_t._int_meta_transit18", 1, false],
-        ["fabric_metadata_t._int_meta_sink19", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id20", 32, false],
-        ["fabric_metadata_t._int_meta_new_words21", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes22", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp23", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp24", 32, false],
-        ["_padding_0", 5, false]
+        ["fabric_metadata_t._ip_proto13", 8, false],
+        ["fabric_metadata_t._l4_sport14", 16, false],
+        ["fabric_metadata_t._l4_dport15", 16, false],
+        ["fabric_metadata_t._int_meta_source16", 1, false],
+        ["fabric_metadata_t._int_meta_transit17", 1, false],
+        ["fabric_metadata_t._int_meta_sink18", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id19", 32, false],
+        ["fabric_metadata_t._int_meta_new_words20", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes21", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp22", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp23", 32, false],
+        ["_padding_0", 6, false]
       ]
     },
     {
@@ -436,7 +435,108 @@
   "header_union_types" : [],
   "header_unions" : [],
   "header_union_stacks" : [],
-  "field_lists" : [],
+  "field_lists" : [
+    {
+      "id" : 1,
+      "name" : "fl",
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 77,
+        "column" : 40,
+        "source_fragment" : "standard_metadata"
+      },
+      "elements" : [
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "clone_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "instance_type"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "drop"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "packet_length"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_timedelta"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "lf_field_list"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "mcast_grp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "resubmit_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_rid"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "checksum_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "parser_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "priority"]
+        }
+      ]
+    }
+  ],
   "errors" : [
     ["NoError", 1],
     ["PacketTooShort", 2],
@@ -748,7 +848,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
                 },
                 {
                   "type" : "field",
@@ -833,7 +933,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -846,7 +946,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -882,7 +982,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -895,7 +995,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -1430,7 +1530,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source16"]
             },
             {
               "type" : "expression",
@@ -1794,37 +1894,32 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.clone_to_cpu",
+      "name" : "FabricIngress.acl.set_clone_session_id",
       "id" : 19,
-      "runtime_data" : [],
+      "runtime_data" : [
+        {
+          "name" : "clone_id",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
-          "op" : "assign",
+          "op" : "clone_ingress_pkt_to_egress",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
+              "type" : "runtime_data",
+              "value" : 0
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x1"
             }
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 37,
-            "source_fragment" : "= true; ..."
+            "column" : 8,
+            "source_fragment" : "clone3<standard_metadata_t>(CloneType.I2E, clone_id, standard_metadata)"
           }
         }
       ]
@@ -2943,7 +3038,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
             }
           ],
           "source_info" : {
@@ -3092,7 +3187,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit17"]
             },
             {
               "type" : "expression",
@@ -3121,7 +3216,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             },
             {
               "type" : "runtime_data",
@@ -3219,7 +3314,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -3233,7 +3328,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3261,7 +3356,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -3275,7 +3370,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3344,7 +3439,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -3358,7 +3453,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3386,7 +3481,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -3400,7 +3495,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3535,7 +3630,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -3549,7 +3644,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3577,7 +3672,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -3591,7 +3686,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3705,7 +3800,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -3719,7 +3814,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3747,7 +3842,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -3761,7 +3856,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3941,7 +4036,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -3955,7 +4050,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3983,7 +4078,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -3997,7 +4092,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4145,7 +4240,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -4159,7 +4254,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4187,7 +4282,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -4201,7 +4296,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4415,7 +4510,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -4429,7 +4524,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4457,7 +4552,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -4471,7 +4566,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4525,7 +4620,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -4540,7 +4635,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -4554,7 +4649,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4582,7 +4677,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -4596,7 +4691,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4716,7 +4811,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -4731,7 +4826,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -4745,7 +4840,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4773,7 +4868,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -4787,7 +4882,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4875,7 +4970,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -4890,7 +4985,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -4904,7 +4999,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4932,7 +5027,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -4946,7 +5041,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5100,7 +5195,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -5115,7 +5210,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -5129,7 +5224,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5157,7 +5252,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -5171,7 +5266,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5304,7 +5399,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -5319,7 +5414,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -5333,7 +5428,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5361,7 +5456,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -5375,7 +5470,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5574,7 +5669,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -5589,7 +5684,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -5603,7 +5698,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5631,7 +5726,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -5645,7 +5740,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5812,7 +5907,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -5827,7 +5922,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -5841,7 +5936,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5869,7 +5964,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -5883,7 +5978,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6116,7 +6211,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id19"]
             }
           ],
           "source_info" : {
@@ -6131,7 +6226,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -6145,7 +6240,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6173,7 +6268,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -6187,7 +6282,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6262,7 +6357,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -6276,7 +6371,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6304,7 +6399,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -6318,7 +6413,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6406,7 +6501,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -6420,7 +6515,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6448,7 +6543,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -6462,7 +6557,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6584,7 +6679,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -6598,7 +6693,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6626,7 +6721,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -6640,7 +6735,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6732,7 +6827,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -6746,7 +6841,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6774,7 +6869,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -6788,7 +6883,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6914,7 +7009,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -6928,7 +7023,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6956,7 +7051,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -6970,7 +7065,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7115,7 +7210,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -7129,7 +7224,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7157,7 +7252,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -7171,7 +7266,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7350,7 +7445,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -7364,7 +7459,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7392,7 +7487,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -7406,7 +7501,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7475,7 +7570,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -7489,7 +7584,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7517,7 +7612,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -7531,7 +7626,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7634,7 +7729,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -7648,7 +7743,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7676,7 +7771,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -7690,7 +7785,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7812,7 +7907,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -7826,7 +7921,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7854,7 +7949,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -7868,7 +7963,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8024,7 +8119,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -8038,7 +8133,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8066,7 +8161,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -8080,7 +8175,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8206,7 +8301,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -8220,7 +8315,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8248,7 +8343,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -8262,7 +8357,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8422,7 +8517,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -8436,7 +8531,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8464,7 +8559,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -8478,7 +8573,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8657,7 +8752,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -8671,7 +8766,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8699,7 +8794,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -8713,7 +8808,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8926,7 +9021,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
             },
             {
               "type" : "expression",
@@ -8940,7 +9035,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8968,7 +9063,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
             },
             {
               "type" : "expression",
@@ -8982,7 +9077,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9346,28 +9441,6 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_6",
-      "id" : 79,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -9377,7 +9450,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "line" : 44,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -9396,7 +9469,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 50,
+            "line" : 45,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -9406,7 +9479,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 47,
             "column" : 12,
             "source_fragment" : "exit"
           }
@@ -9414,8 +9487,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 80,
+      "name" : "act_6",
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9436,8 +9509,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 81,
+      "name" : "act_7",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9466,8 +9539,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 82,
+      "name" : "act_8",
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9496,8 +9569,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 83,
+      "name" : "act_9",
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9518,8 +9591,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 84,
+      "name" : "act_10",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9567,8 +9640,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 85,
+      "name" : "act_11",
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9589,8 +9662,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 86,
+      "name" : "act_12",
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9638,8 +9711,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 87,
+      "name" : "act_13",
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9668,8 +9741,8 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 88,
+      "name" : "act_14",
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9704,8 +9777,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 89,
+      "name" : "act_15",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9731,7 +9804,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       }
                     }
                   },
@@ -9753,8 +9826,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 90,
+      "name" : "act_16",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9802,8 +9875,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 91,
+      "name" : "act_17",
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9829,7 +9902,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes22"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes21"]
                       }
                     }
                   },
@@ -9851,8 +9924,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 92,
+      "name" : "act_18",
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9878,7 +9951,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words21"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words20"]
                       }
                     }
                   },
@@ -10234,19 +10307,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             },
             {
@@ -10305,12 +10378,12 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "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"],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_18",
           "next_tables" : {
             "FabricIngress.acl.set_next_id_acl" : "node_18",
             "FabricIngress.acl.punt_to_cpu" : "node_18",
-            "FabricIngress.acl.clone_to_cpu" : "node_18",
+            "FabricIngress.acl.set_clone_session_id" : "node_18",
             "FabricIngress.acl.drop" : "node_18",
             "FabricIngress.acl.nop_acl" : "node_18"
           },
@@ -10593,15 +10666,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
               }
             ]
           }
@@ -10927,9 +11000,9 @@
           "id" : 17,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
+            "line" : 44,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
           },
           "key" : [],
           "match_type" : "exact",
@@ -10940,9 +11013,9 @@
           "direct_meters" : null,
           "action_ids" : [78],
           "actions" : ["act_5"],
-          "base_default_next" : "tbl_act_6",
+          "base_default_next" : "node_34",
           "next_tables" : {
-            "act_5" : "tbl_act_6"
+            "act_5" : "node_34"
           },
           "default_entry" : {
             "action_id" : 78,
@@ -10955,10 +11028,10 @@
           "name" : "tbl_act_6",
           "id" : 18,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "filename" : "include/control/next.p4",
+            "line" : 308,
             "column" : 12,
-            "source_fragment" : "hdr.packet_in.setValid(); ..."
+            "source_fragment" : "mark_to_drop(standard_metadata)"
           },
           "key" : [],
           "match_type" : "exact",
@@ -10981,37 +11054,8 @@
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 308,
-            "column" : 12,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          },
-          "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_38",
-          "next_tables" : {
-            "act_7" : "node_38"
-          },
-          "default_entry" : {
-            "action_id" : 80,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 20,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -11040,7 +11084,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 21,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -11069,7 +11113,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 22,
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 291,
@@ -11100,8 +11144,8 @@
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_8",
-            "__MISS__" : "tbl_act_9"
+            "__HIT__" : "tbl_act_7",
+            "__MISS__" : "tbl_act_8"
           },
           "default_entry" : {
             "action_id" : 36,
@@ -11111,6 +11155,29 @@
           }
         },
         {
+          "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_43",
+          "next_tables" : {
+            "act_7" : "node_43"
+          },
+          "default_entry" : {
+            "action_id" : 80,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_8",
           "id" : 23,
           "key" : [],
@@ -11122,9 +11189,9 @@
           "direct_meters" : null,
           "action_ids" : [81],
           "actions" : ["act_8"],
-          "base_default_next" : "node_45",
+          "base_default_next" : "node_43",
           "next_tables" : {
-            "act_8" : "node_45"
+            "act_8" : "node_43"
           },
           "default_entry" : {
             "action_id" : 81,
@@ -11134,31 +11201,8 @@
           }
         },
         {
-          "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" : [82],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_45",
-          "next_tables" : {
-            "act_9" : "node_45"
-          },
-          "default_entry" : {
-            "action_id" : 82,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 25,
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -11174,9 +11218,9 @@
           "direct_meters" : null,
           "action_ids" : [75],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_48",
+          "base_default_next" : "node_46",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_48"
+            "FabricEgress.egress_next.push_vlan" : "node_46"
           },
           "default_entry" : {
             "action_id" : 75,
@@ -11186,8 +11230,8 @@
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 26,
+          "name" : "tbl_act_9",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 326,
@@ -11201,22 +11245,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_50",
+          "action_ids" : [83],
+          "actions" : ["act_10"],
+          "base_default_next" : "node_48",
           "next_tables" : {
-            "act_11" : "node_50"
+            "act_10" : "node_48"
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 83,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 27,
+          "name" : "tbl_act_10",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -11230,22 +11274,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [83],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_56",
+          "action_ids" : [82],
+          "actions" : ["act_9"],
+          "base_default_next" : "node_54",
           "next_tables" : {
-            "act_10" : "node_56"
+            "act_9" : "node_54"
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 28,
+          "name" : "tbl_act_11",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 330,
@@ -11259,22 +11303,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [86],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_54",
+          "action_ids" : [85],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_52",
           "next_tables" : {
-            "act_13" : "node_54"
+            "act_12" : "node_52"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 85,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 29,
+          "name" : "tbl_act_12",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -11288,14 +11332,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_56",
+          "action_ids" : [84],
+          "actions" : ["act_11"],
+          "base_default_next" : "node_54",
           "next_tables" : {
-            "act_12" : "node_56"
+            "act_11" : "node_54"
           },
           "default_entry" : {
-            "action_id" : 85,
+            "action_id" : 84,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11303,7 +11347,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 30,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -11326,13 +11370,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             }
           ],
@@ -11344,10 +11388,10 @@
           "direct_meters" : null,
           "action_ids" : [39, 34],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_59",
+          "base_default_next" : "node_57",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_59",
-            "nop" : "node_59"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_57",
+            "nop" : "node_57"
           },
           "default_entry" : {
             "action_id" : 34,
@@ -11357,8 +11401,8 @@
           }
         },
         {
-          "name" : "tbl_act_14",
-          "id" : 31,
+          "name" : "tbl_act_13",
+          "id" : 30,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11366,14 +11410,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87],
-          "actions" : ["act_14"],
+          "action_ids" : [86],
+          "actions" : ["act_13"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_14" : "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" : 87,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11381,7 +11425,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 32,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -11404,10 +11448,10 @@
           "direct_meters" : null,
           "action_ids" : [40, 35],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_62",
+          "base_default_next" : "node_60",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_62",
-            "nop" : "node_62"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_60",
+            "nop" : "node_60"
           },
           "default_entry" : {
             "action_id" : 35,
@@ -11417,8 +11461,8 @@
           }
         },
         {
-          "name" : "tbl_act_15",
-          "id" : 33,
+          "name" : "tbl_act_14",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -11432,14 +11476,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
-          "actions" : ["act_15"],
-          "base_default_next" : "node_64",
+          "action_ids" : [87],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_62",
           "next_tables" : {
-            "act_15" : "node_64"
+            "act_14" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11447,7 +11491,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 34,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -11805,7 +11849,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 35,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -11828,25 +11872,25 @@
           "direct_meters" : null,
           "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_16",
+          "base_default_next" : "tbl_act_15",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_16",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_16",
-            "NoAction" : "tbl_act_16"
+            "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" : 38,
@@ -12162,8 +12206,8 @@
           ]
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 36,
+          "name" : "tbl_act_15",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -12177,22 +12221,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_68",
+          "action_ids" : [89],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_66",
           "next_tables" : {
-            "act_17" : "node_68"
+            "act_16" : "node_66"
           },
           "default_entry" : {
-            "action_id" : 90,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 37,
+          "name" : "tbl_act_16",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -12206,22 +12250,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89],
-          "actions" : ["act_16"],
-          "base_default_next" : "node_70",
+          "action_ids" : [88],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_16" : "node_70"
+            "act_15" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 89,
+            "action_id" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 38,
+          "name" : "tbl_act_17",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -12235,22 +12279,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
-          "actions" : ["act_18"],
-          "base_default_next" : "node_72",
+          "action_ids" : [90],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "act_18" : "node_72"
+            "act_17" : "node_70"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 39,
+          "name" : "tbl_act_18",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -12264,14 +12308,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92],
-          "actions" : ["act_19"],
+          "action_ids" : [91],
+          "actions" : ["act_18"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_19" : null
+            "act_18" : null
           },
           "default_entry" : {
-            "action_id" : 92,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12336,72 +12380,12 @@
               }
             }
           },
-          "true_next" : "node_33",
-          "false_next" : "node_36"
-        },
-        {
-          "name" : "node_33",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 44,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.is_multicast == true && ..."
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          },
           "true_next" : "tbl_act_5",
-          "false_next" : "tbl_act_6"
+          "false_next" : "node_34"
         },
         {
-          "name" : "node_36",
-          "id" : 13,
+          "name" : "node_34",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 306,
@@ -12449,12 +12433,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
-          "false_next" : "node_38"
+          "true_next" : "tbl_act_6",
+          "false_next" : "node_36"
         },
         {
-          "name" : "node_38",
-          "id" : 14,
+          "name" : "node_36",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 311,
@@ -12475,12 +12459,12 @@
               }
             }
           },
-          "true_next" : "node_39",
+          "true_next" : "node_37",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_39",
-          "id" : 15,
+          "name" : "node_37",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -12502,8 +12486,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_45",
-          "id" : 16,
+          "name" : "node_43",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -12528,12 +12512,12 @@
               }
             }
           },
-          "true_next" : "node_46",
-          "false_next" : "node_48"
+          "true_next" : "node_44",
+          "false_next" : "node_46"
         },
         {
-          "name" : "node_46",
-          "id" : 17,
+          "name" : "node_44",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -12555,11 +12539,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_48"
+          "false_next" : "node_46"
         },
         {
-          "name" : "node_48",
-          "id" : 18,
+          "name" : "node_46",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 325,
@@ -12577,12 +12561,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
-          "false_next" : "node_52"
+          "true_next" : "tbl_act_9",
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_50",
-          "id" : 19,
+          "name" : "node_48",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -12603,12 +12587,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_11",
-          "false_next" : "node_56"
+          "true_next" : "tbl_act_10",
+          "false_next" : "node_54"
         },
         {
-          "name" : "node_52",
-          "id" : 20,
+          "name" : "node_50",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 329,
@@ -12626,12 +12610,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_12",
-          "false_next" : "node_56"
+          "true_next" : "tbl_act_11",
+          "false_next" : "node_54"
         },
         {
-          "name" : "node_54",
-          "id" : 21,
+          "name" : "node_52",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -12652,12 +12636,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_56"
+          "true_next" : "tbl_act_12",
+          "false_next" : "node_54"
         },
         {
-          "name" : "node_56",
-          "id" : 22,
+          "name" : "node_54",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -12733,11 +12717,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_57"
+          "true_next" : "node_55"
         },
         {
-          "name" : "node_57",
-          "id" : 23,
+          "name" : "node_55",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 106,
@@ -12755,7 +12739,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source17"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source16"]
                   }
                 }
               },
@@ -12766,11 +12750,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_59"
+          "false_next" : "node_57"
         },
         {
-          "name" : "node_59",
-          "id" : 24,
+          "name" : "node_57",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -12789,11 +12773,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_14"
+          "true_next" : "tbl_act_13"
         },
         {
-          "name" : "node_62",
-          "id" : 25,
+          "name" : "node_60",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -12811,7 +12795,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit18"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit17"]
                   }
                 }
               },
@@ -12821,12 +12805,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "node_64"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_62"
         },
         {
-          "name" : "node_64",
-          "id" : 26,
+          "name" : "node_62",
+          "id" : 25,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -12849,8 +12833,8 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_68",
-          "id" : 27,
+          "name" : "node_66",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -12868,12 +12852,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "node_70"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_68"
         },
         {
-          "name" : "node_70",
-          "id" : 28,
+          "name" : "node_68",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -12891,12 +12875,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_18",
-          "false_next" : "node_72"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_70"
         },
         {
-          "name" : "node_72",
-          "id" : 29,
+          "name" : "node_70",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -12915,7 +12899,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_19"
+          "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 02d6c94..43466cf 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
@@ -259,7 +259,7 @@
     id: 16829684
   }
   action_refs {
-    id: 16790975
+    id: 16781601
   }
   action_refs {
     id: 16820765
@@ -594,9 +594,14 @@
 }
 actions {
   preamble {
-    id: 16790975
-    name: "FabricIngress.acl.clone_to_cpu"
-    alias: "clone_to_cpu"
+    id: 16781601
+    name: "FabricIngress.acl.set_clone_session_id"
+    alias: "set_clone_session_id"
+  }
+  params {
+    id: 1
+    name: "clone_id"
+    bitwidth: 32
   }
 }
 actions {
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 9d422da..bbd7d07 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
@@ -28,24 +28,22 @@
         ["fabric_metadata_t._next_id10", 32, false],
         ["fabric_metadata_t._is_multicast11", 1, false],
         ["fabric_metadata_t._is_controller_packet_out12", 1, false],
-        ["fabric_metadata_t._clone_to_cpu13", 1, false],
-        ["fabric_metadata_t._ip_proto14", 8, false],
-        ["fabric_metadata_t._l4_sport15", 16, false],
-        ["fabric_metadata_t._l4_dport16", 16, false],
-        ["fabric_metadata_t._spgw_direction17", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
-        ["fabric_metadata_t._spgw_teid19", 32, false],
-        ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
-        ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
-        ["fabric_metadata_t._int_meta_source22", 1, false],
-        ["fabric_metadata_t._int_meta_transit23", 1, false],
-        ["fabric_metadata_t._int_meta_sink24", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id25", 32, false],
-        ["fabric_metadata_t._int_meta_new_words26", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes27", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp28", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp29", 32, false],
-        ["_padding_0", 7, false]
+        ["fabric_metadata_t._ip_proto13", 8, false],
+        ["fabric_metadata_t._l4_sport14", 16, false],
+        ["fabric_metadata_t._l4_dport15", 16, false],
+        ["fabric_metadata_t._spgw_direction16", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len17", 16, false],
+        ["fabric_metadata_t._spgw_teid18", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr19", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr20", 32, false],
+        ["fabric_metadata_t._int_meta_source21", 1, false],
+        ["fabric_metadata_t._int_meta_transit22", 1, false],
+        ["fabric_metadata_t._int_meta_sink23", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id24", 32, false],
+        ["fabric_metadata_t._int_meta_new_words25", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes26", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp27", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp28", 32, false]
       ]
     },
     {
@@ -496,7 +494,108 @@
   "header_union_types" : [],
   "header_unions" : [],
   "header_union_stacks" : [],
-  "field_lists" : [],
+  "field_lists" : [
+    {
+      "id" : 1,
+      "name" : "fl",
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 77,
+        "column" : 40,
+        "source_fragment" : "standard_metadata"
+      },
+      "elements" : [
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "clone_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "instance_type"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "drop"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "packet_length"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_timedelta"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "lf_field_list"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "mcast_grp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "resubmit_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_rid"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "checksum_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "parser_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "priority"]
+        }
+      ]
+    }
+  ],
   "errors" : [
     ["NoError", 1],
     ["PacketTooShort", 2],
@@ -808,7 +907,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
                 },
                 {
                   "type" : "field",
@@ -893,7 +992,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -906,7 +1005,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -942,7 +1041,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -955,7 +1054,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -1164,7 +1263,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -1177,7 +1276,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -1834,7 +1933,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid18"]
             },
             {
               "type" : "runtime_data",
@@ -1853,7 +1952,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr19"]
             },
             {
               "type" : "runtime_data",
@@ -1872,7 +1971,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -1898,7 +1997,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source21"]
             },
             {
               "type" : "expression",
@@ -2262,37 +2361,32 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.clone_to_cpu",
+      "name" : "FabricIngress.acl.set_clone_session_id",
       "id" : 23,
-      "runtime_data" : [],
+      "runtime_data" : [
+        {
+          "name" : "clone_id",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
-          "op" : "assign",
+          "op" : "clone_ingress_pkt_to_egress",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
+              "type" : "runtime_data",
+              "value" : 0
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x1"
             }
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 37,
-            "source_fragment" : "= true; ..."
+            "column" : 8,
+            "source_fragment" : "clone3<standard_metadata_t>(CloneType.I2E, clone_id, standard_metadata)"
           }
         }
       ]
@@ -3204,7 +3298,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -3290,7 +3384,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -3316,7 +3410,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -3401,7 +3495,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
             },
             {
               "type" : "field",
@@ -3805,7 +3899,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr19"]
             }
           ],
           "source_info" : {
@@ -3824,7 +3918,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr20"]
             }
           ],
           "source_info" : {
@@ -3925,7 +4019,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4124,7 +4218,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
             }
           ],
           "source_info" : {
@@ -4143,7 +4237,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid18"]
             }
           ],
           "source_info" : {
@@ -4516,7 +4610,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
             }
           ],
           "source_info" : {
@@ -4665,7 +4759,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit22"]
             },
             {
               "type" : "expression",
@@ -4694,7 +4788,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             },
             {
               "type" : "runtime_data",
@@ -4792,7 +4886,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -4806,7 +4900,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4834,7 +4928,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -4848,7 +4942,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4917,7 +5011,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -4931,7 +5025,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4959,7 +5053,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -4973,7 +5067,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5108,7 +5202,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -5122,7 +5216,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5150,7 +5244,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -5164,7 +5258,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5278,7 +5372,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -5292,7 +5386,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5320,7 +5414,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -5334,7 +5428,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5514,7 +5608,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -5528,7 +5622,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5556,7 +5650,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -5570,7 +5664,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5718,7 +5812,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -5732,7 +5826,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5760,7 +5854,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -5774,7 +5868,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5988,7 +6082,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -6002,7 +6096,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6030,7 +6124,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -6044,7 +6138,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6098,7 +6192,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -6113,7 +6207,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -6127,7 +6221,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6155,7 +6249,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -6169,7 +6263,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6289,7 +6383,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -6304,7 +6398,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -6318,7 +6412,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6346,7 +6440,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -6360,7 +6454,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6448,7 +6542,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -6463,7 +6557,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -6477,7 +6571,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6505,7 +6599,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -6519,7 +6613,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6673,7 +6767,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -6688,7 +6782,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -6702,7 +6796,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6730,7 +6824,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -6744,7 +6838,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6877,7 +6971,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -6892,7 +6986,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -6906,7 +7000,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6934,7 +7028,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -6948,7 +7042,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7147,7 +7241,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -7162,7 +7256,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -7176,7 +7270,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7204,7 +7298,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -7218,7 +7312,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7385,7 +7479,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -7400,7 +7494,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -7414,7 +7508,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7442,7 +7536,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -7456,7 +7550,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7689,7 +7783,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id24"]
             }
           ],
           "source_info" : {
@@ -7704,7 +7798,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -7718,7 +7812,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7746,7 +7840,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -7760,7 +7854,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7835,7 +7929,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -7849,7 +7943,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7877,7 +7971,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -7891,7 +7985,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7979,7 +8073,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -7993,7 +8087,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8021,7 +8115,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -8035,7 +8129,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8157,7 +8251,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -8171,7 +8265,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8199,7 +8293,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -8213,7 +8307,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8305,7 +8399,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -8319,7 +8413,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8347,7 +8441,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -8361,7 +8455,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8487,7 +8581,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -8501,7 +8595,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8529,7 +8623,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -8543,7 +8637,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8688,7 +8782,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -8702,7 +8796,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8730,7 +8824,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -8744,7 +8838,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8923,7 +9017,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -8937,7 +9031,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8965,7 +9059,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -8979,7 +9073,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9048,7 +9142,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -9062,7 +9156,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9090,7 +9184,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -9104,7 +9198,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9207,7 +9301,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -9221,7 +9315,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9249,7 +9343,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -9263,7 +9357,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9385,7 +9479,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -9399,7 +9493,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9427,7 +9521,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -9441,7 +9535,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9597,7 +9691,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -9611,7 +9705,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9639,7 +9733,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -9653,7 +9747,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9779,7 +9873,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -9793,7 +9887,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9821,7 +9915,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -9835,7 +9929,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9995,7 +10089,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -10009,7 +10103,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10037,7 +10131,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -10051,7 +10145,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10230,7 +10324,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -10244,7 +10338,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10272,7 +10366,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -10286,7 +10380,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10499,7 +10593,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
             },
             {
               "type" : "expression",
@@ -10513,7 +10607,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10541,7 +10635,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
             },
             {
               "type" : "expression",
@@ -10555,7 +10649,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10919,28 +11013,6 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_21",
-      "id" : 99,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -10950,7 +11022,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "line" : 44,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -10969,7 +11041,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 50,
+            "line" : 45,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -10979,7 +11051,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 47,
             "column" : 12,
             "source_fragment" : "exit"
           }
@@ -10987,8 +11059,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 100,
+      "name" : "act_21",
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11009,8 +11081,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 101,
+      "name" : "act_22",
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11039,8 +11111,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 102,
+      "name" : "act_23",
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11069,8 +11141,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 103,
+      "name" : "act_24",
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11091,8 +11163,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 104,
+      "name" : "act_25",
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11140,8 +11212,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 105,
+      "name" : "act_26",
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11162,8 +11234,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 106,
+      "name" : "act_27",
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11211,8 +11283,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 107,
+      "name" : "act_28",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11241,8 +11313,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 108,
+      "name" : "act_29",
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11277,8 +11349,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 109,
+      "name" : "act_30",
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11304,7 +11376,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       }
                     }
                   },
@@ -11326,8 +11398,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 110,
+      "name" : "act_31",
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11375,8 +11447,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 111,
+      "name" : "act_32",
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11402,7 +11474,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes26"]
                       }
                     }
                   },
@@ -11424,8 +11496,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 112,
+      "name" : "act_33",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11451,7 +11523,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words25"]
                       }
                     }
                   },
@@ -12315,19 +12387,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             },
             {
@@ -12386,12 +12458,12 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "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"],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_43",
           "next_tables" : {
             "FabricIngress.acl.set_next_id_acl" : "node_43",
             "FabricIngress.acl.punt_to_cpu" : "node_43",
-            "FabricIngress.acl.clone_to_cpu" : "node_43",
+            "FabricIngress.acl.set_clone_session_id" : "node_43",
             "FabricIngress.acl.drop" : "node_43",
             "FabricIngress.acl.nop_acl" : "node_43"
           },
@@ -12674,15 +12746,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
               }
             ]
           }
@@ -13179,9 +13251,9 @@
           "id" : 35,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
+            "line" : 44,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
           },
           "key" : [],
           "match_type" : "exact",
@@ -13192,9 +13264,9 @@
           "direct_meters" : null,
           "action_ids" : [98],
           "actions" : ["act_20"],
-          "base_default_next" : "tbl_act_21",
+          "base_default_next" : "node_59",
           "next_tables" : {
-            "act_20" : "tbl_act_21"
+            "act_20" : "node_59"
           },
           "default_entry" : {
             "action_id" : 98,
@@ -13207,10 +13279,10 @@
           "name" : "tbl_act_21",
           "id" : 36,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "filename" : "include/control/next.p4",
+            "line" : 308,
             "column" : 12,
-            "source_fragment" : "hdr.packet_in.setValid(); ..."
+            "source_fragment" : "mark_to_drop(standard_metadata)"
           },
           "key" : [],
           "match_type" : "exact",
@@ -13233,37 +13305,8 @@
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 37,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 308,
-            "column" : 12,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          },
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [100],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_63",
-          "next_tables" : {
-            "act_22" : "node_63"
-          },
-          "default_entry" : {
-            "action_id" : 100,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 38,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -13292,7 +13335,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 39,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -13321,7 +13364,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 40,
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 291,
@@ -13352,8 +13395,8 @@
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_23",
-            "__MISS__" : "tbl_act_24"
+            "__HIT__" : "tbl_act_22",
+            "__MISS__" : "tbl_act_23"
           },
           "default_entry" : {
             "action_id" : 55,
@@ -13363,6 +13406,29 @@
           }
         },
         {
+          "name" : "tbl_act_22",
+          "id" : 40,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [100],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_68",
+          "next_tables" : {
+            "act_22" : "node_68"
+          },
+          "default_entry" : {
+            "action_id" : 100,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_23",
           "id" : 41,
           "key" : [],
@@ -13374,9 +13440,9 @@
           "direct_meters" : null,
           "action_ids" : [101],
           "actions" : ["act_23"],
-          "base_default_next" : "node_70",
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_23" : "node_70"
+            "act_23" : "node_68"
           },
           "default_entry" : {
             "action_id" : 101,
@@ -13386,31 +13452,8 @@
           }
         },
         {
-          "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" : [102],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_24" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 102,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 43,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -13426,9 +13469,9 @@
           "direct_meters" : null,
           "action_ids" : [95],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_73",
+          "base_default_next" : "node_71",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_73"
+            "FabricEgress.egress_next.push_vlan" : "node_71"
           },
           "default_entry" : {
             "action_id" : 95,
@@ -13438,8 +13481,8 @@
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 44,
+          "name" : "tbl_act_24",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 326,
@@ -13453,22 +13496,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_75",
+          "action_ids" : [103],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_73",
           "next_tables" : {
-            "act_26" : "node_75"
+            "act_25" : "node_73"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 103,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 45,
+          "name" : "tbl_act_25",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -13482,22 +13525,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [103],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_81",
+          "action_ids" : [102],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_79",
           "next_tables" : {
-            "act_25" : "node_81"
+            "act_24" : "node_79"
           },
           "default_entry" : {
-            "action_id" : 103,
+            "action_id" : 102,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
-          "id" : 46,
+          "name" : "tbl_act_26",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 330,
@@ -13511,22 +13554,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_79",
+          "action_ids" : [105],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_77",
           "next_tables" : {
-            "act_28" : "node_79"
+            "act_27" : "node_77"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 105,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
-          "id" : 47,
+          "name" : "tbl_act_27",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -13540,14 +13583,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_81",
+          "action_ids" : [104],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_79",
           "next_tables" : {
-            "act_27" : "node_81"
+            "act_26" : "node_79"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 104,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13555,7 +13598,7 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 48,
+          "id" : 47,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 228,
@@ -13571,9 +13614,9 @@
           "direct_meters" : null,
           "action_ids" : [58],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_83",
+          "base_default_next" : "node_81",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_83"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_81"
           },
           "default_entry" : {
             "action_id" : 58,
@@ -13584,7 +13627,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 49,
+          "id" : 48,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -13607,13 +13650,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             }
           ],
@@ -13625,10 +13668,10 @@
           "direct_meters" : null,
           "action_ids" : [59, 53],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_86",
+          "base_default_next" : "node_84",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_86",
-            "nop" : "node_86"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_84",
+            "nop" : "node_84"
           },
           "default_entry" : {
             "action_id" : 53,
@@ -13638,8 +13681,8 @@
           }
         },
         {
-          "name" : "tbl_act_29",
-          "id" : 50,
+          "name" : "tbl_act_28",
+          "id" : 49,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13647,14 +13690,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
-          "actions" : ["act_29"],
+          "action_ids" : [106],
+          "actions" : ["act_28"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_29" : "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" : 107,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13662,7 +13705,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 51,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -13685,10 +13728,10 @@
           "direct_meters" : null,
           "action_ids" : [60, 54],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_89",
+          "base_default_next" : "node_87",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_89",
-            "nop" : "node_89"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_87",
+            "nop" : "node_87"
           },
           "default_entry" : {
             "action_id" : 54,
@@ -13698,8 +13741,8 @@
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 52,
+          "name" : "tbl_act_29",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -13713,14 +13756,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
-          "actions" : ["act_30"],
-          "base_default_next" : "node_91",
+          "action_ids" : [107],
+          "actions" : ["act_29"],
+          "base_default_next" : "node_89",
           "next_tables" : {
-            "act_30" : "node_91"
+            "act_29" : "node_89"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13728,7 +13771,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 53,
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -14086,7 +14129,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 54,
+          "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -14109,25 +14152,25 @@
           "direct_meters" : null,
           "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_31",
+          "base_default_next" : "tbl_act_30",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_31",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_31",
-            "NoAction" : "tbl_act_31"
+            "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" : 57,
@@ -14443,8 +14486,8 @@
           ]
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 55,
+          "name" : "tbl_act_30",
+          "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -14458,22 +14501,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [110],
-          "actions" : ["act_32"],
-          "base_default_next" : "node_95",
+          "action_ids" : [109],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_93",
           "next_tables" : {
-            "act_32" : "node_95"
+            "act_31" : "node_93"
           },
           "default_entry" : {
-            "action_id" : 110,
+            "action_id" : 109,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 56,
+          "name" : "tbl_act_31",
+          "id" : 55,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -14487,22 +14530,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_97",
+          "action_ids" : [108],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_95",
           "next_tables" : {
-            "act_31" : "node_97"
+            "act_30" : "node_95"
           },
           "default_entry" : {
-            "action_id" : 109,
+            "action_id" : 108,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 57,
+          "name" : "tbl_act_32",
+          "id" : 56,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -14516,22 +14559,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111],
-          "actions" : ["act_33"],
-          "base_default_next" : "node_99",
+          "action_ids" : [110],
+          "actions" : ["act_32"],
+          "base_default_next" : "node_97",
           "next_tables" : {
-            "act_33" : "node_99"
+            "act_32" : "node_97"
           },
           "default_entry" : {
-            "action_id" : 111,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_34",
-          "id" : 58,
+          "name" : "tbl_act_33",
+          "id" : 57,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -14545,14 +14588,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112],
-          "actions" : ["act_34"],
+          "action_ids" : [111],
+          "actions" : ["act_33"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_34" : null
+            "act_33" : null
           },
           "default_entry" : {
-            "action_id" : 112,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14617,72 +14660,12 @@
               }
             }
           },
-          "true_next" : "node_58",
-          "false_next" : "node_61"
-        },
-        {
-          "name" : "node_58",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 44,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.is_multicast == true && ..."
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          },
           "true_next" : "tbl_act_20",
-          "false_next" : "tbl_act_21"
+          "false_next" : "node_59"
         },
         {
-          "name" : "node_61",
-          "id" : 20,
+          "name" : "node_59",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 306,
@@ -14730,12 +14713,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_22",
-          "false_next" : "node_63"
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_63",
-          "id" : 21,
+          "name" : "node_61",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 311,
@@ -14756,12 +14739,12 @@
               }
             }
           },
-          "true_next" : "node_64",
+          "true_next" : "node_62",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_64",
-          "id" : 22,
+          "name" : "node_62",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -14783,8 +14766,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_70",
-          "id" : 23,
+          "name" : "node_68",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -14809,12 +14792,12 @@
               }
             }
           },
-          "true_next" : "node_71",
-          "false_next" : "node_73"
+          "true_next" : "node_69",
+          "false_next" : "node_71"
         },
         {
-          "name" : "node_71",
-          "id" : 24,
+          "name" : "node_69",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -14836,11 +14819,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_73"
+          "false_next" : "node_71"
         },
         {
-          "name" : "node_73",
-          "id" : 25,
+          "name" : "node_71",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 325,
@@ -14858,12 +14841,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_77"
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_75"
         },
         {
-          "name" : "node_75",
-          "id" : 26,
+          "name" : "node_73",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -14884,12 +14867,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_81"
+          "true_next" : "tbl_act_25",
+          "false_next" : "node_79"
         },
         {
-          "name" : "node_77",
-          "id" : 27,
+          "name" : "node_75",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 329,
@@ -14907,12 +14890,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_81"
+          "true_next" : "tbl_act_26",
+          "false_next" : "node_79"
         },
         {
-          "name" : "node_79",
-          "id" : 28,
+          "name" : "node_77",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -14933,12 +14916,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
-          "false_next" : "node_81"
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_79"
         },
         {
-          "name" : "node_81",
-          "id" : 29,
+          "name" : "node_79",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 227,
@@ -14951,7 +14934,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14960,11 +14943,11 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_83"
+          "false_next" : "node_81"
         },
         {
-          "name" : "node_83",
-          "id" : 30,
+          "name" : "node_81",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -15040,11 +15023,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_84"
+          "true_next" : "node_82"
         },
         {
-          "name" : "node_84",
-          "id" : 31,
+          "name" : "node_82",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 106,
@@ -15062,7 +15045,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source21"]
                   }
                 }
               },
@@ -15073,11 +15056,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_86"
+          "false_next" : "node_84"
         },
         {
-          "name" : "node_86",
-          "id" : 32,
+          "name" : "node_84",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -15096,11 +15079,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_29"
+          "true_next" : "tbl_act_28"
         },
         {
-          "name" : "node_89",
-          "id" : 33,
+          "name" : "node_87",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -15118,7 +15101,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit22"]
                   }
                 }
               },
@@ -15128,12 +15111,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_30",
-          "false_next" : "node_91"
+          "true_next" : "tbl_act_29",
+          "false_next" : "node_89"
         },
         {
-          "name" : "node_91",
-          "id" : 34,
+          "name" : "node_89",
+          "id" : 33,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15156,8 +15139,8 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_95",
-          "id" : 35,
+          "name" : "node_93",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -15175,12 +15158,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_32",
-          "false_next" : "node_97"
+          "true_next" : "tbl_act_31",
+          "false_next" : "node_95"
         },
         {
-          "name" : "node_97",
-          "id" : 36,
+          "name" : "node_95",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -15198,12 +15181,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_99"
+          "true_next" : "tbl_act_32",
+          "false_next" : "node_97"
         },
         {
-          "name" : "node_99",
-          "id" : 37,
+          "name" : "node_97",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -15222,7 +15205,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_34"
+          "true_next" : "tbl_act_33"
         }
       ]
     }
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 ee97871..686385f 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
@@ -301,7 +301,7 @@
     id: 16829684
   }
   action_refs {
-    id: 16790975
+    id: 16781601
   }
   action_refs {
     id: 16820765
@@ -658,9 +658,14 @@
 }
 actions {
   preamble {
-    id: 16790975
-    name: "FabricIngress.acl.clone_to_cpu"
-    alias: "clone_to_cpu"
+    id: 16781601
+    name: "FabricIngress.acl.set_clone_session_id"
+    alias: "set_clone_session_id"
+  }
+  params {
+    id: 1
+    name: "clone_id"
+    bitwidth: 32
   }
 }
 actions {
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 ca5fc41..b1d3a47 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
@@ -26,16 +26,15 @@
         ["fabric_metadata_t._next_id10", 32, false],
         ["fabric_metadata_t._is_multicast11", 1, false],
         ["fabric_metadata_t._is_controller_packet_out12", 1, false],
-        ["fabric_metadata_t._clone_to_cpu13", 1, false],
-        ["fabric_metadata_t._ip_proto14", 8, false],
-        ["fabric_metadata_t._l4_sport15", 16, false],
-        ["fabric_metadata_t._l4_dport16", 16, false],
-        ["fabric_metadata_t._spgw_direction17", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
-        ["fabric_metadata_t._spgw_teid19", 32, false],
-        ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
-        ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
-        ["_padding_0", 1, false]
+        ["fabric_metadata_t._ip_proto13", 8, false],
+        ["fabric_metadata_t._l4_sport14", 16, false],
+        ["fabric_metadata_t._l4_dport15", 16, false],
+        ["fabric_metadata_t._spgw_direction16", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len17", 16, false],
+        ["fabric_metadata_t._spgw_teid18", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr19", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr20", 32, false],
+        ["_padding_0", 2, false]
       ]
     },
     {
@@ -311,7 +310,108 @@
   "header_union_types" : [],
   "header_unions" : [],
   "header_union_stacks" : [],
-  "field_lists" : [],
+  "field_lists" : [
+    {
+      "id" : 1,
+      "name" : "fl",
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 77,
+        "column" : 40,
+        "source_fragment" : "standard_metadata"
+      },
+      "elements" : [
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "clone_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "instance_type"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "drop"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "packet_length"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_timedelta"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "lf_field_list"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "mcast_grp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "resubmit_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_rid"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "checksum_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "parser_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "priority"]
+        }
+      ]
+    }
+  ],
   "errors" : [
     ["NoError", 1],
     ["PacketTooShort", 2],
@@ -623,7 +723,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
                 },
                 {
                   "type" : "field",
@@ -695,7 +795,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -708,7 +808,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -744,7 +844,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -757,7 +857,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -953,7 +1053,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
                 },
                 {
                   "type" : "field",
@@ -966,7 +1066,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
                 },
                 {
                   "type" : "field",
@@ -1490,7 +1590,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid18"]
             },
             {
               "type" : "runtime_data",
@@ -1509,7 +1609,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr19"]
             },
             {
               "type" : "runtime_data",
@@ -1528,7 +1628,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -1882,37 +1982,32 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.clone_to_cpu",
+      "name" : "FabricIngress.acl.set_clone_session_id",
       "id" : 21,
-      "runtime_data" : [],
+      "runtime_data" : [
+        {
+          "name" : "clone_id",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
-          "op" : "assign",
+          "op" : "clone_ingress_pkt_to_egress",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
+              "type" : "runtime_data",
+              "value" : 0
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x1"
             }
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 37,
-            "source_fragment" : "= true; ..."
+            "column" : 8,
+            "source_fragment" : "clone3<standard_metadata_t>(CloneType.I2E, clone_id, standard_metadata)"
           }
         }
       ]
@@ -2824,7 +2919,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -2910,7 +3005,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -2936,7 +3031,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
             },
             {
               "type" : "hexstr",
@@ -3021,7 +3116,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
             },
             {
               "type" : "field",
@@ -3401,7 +3496,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr19"]
             }
           ],
           "source_info" : {
@@ -3420,7 +3515,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr20"]
             }
           ],
           "source_info" : {
@@ -3521,7 +3616,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3720,7 +3815,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len17"]
             }
           ],
           "source_info" : {
@@ -3739,7 +3834,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid18"]
             }
           ],
           "source_info" : {
@@ -4090,28 +4185,6 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_21",
-      "id" : 59,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -4121,7 +4194,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "line" : 44,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -4140,7 +4213,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 50,
+            "line" : 45,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -4150,7 +4223,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 47,
             "column" : 12,
             "source_fragment" : "exit"
           }
@@ -4158,8 +4231,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 60,
+      "name" : "act_21",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4180,8 +4253,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 61,
+      "name" : "act_22",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4210,8 +4283,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 62,
+      "name" : "act_23",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4240,8 +4313,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 63,
+      "name" : "act_24",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4262,8 +4335,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 64,
+      "name" : "act_25",
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4311,8 +4384,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 65,
+      "name" : "act_26",
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4333,8 +4406,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 66,
+      "name" : "act_27",
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5224,19 +5297,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto13"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport15"],
               "mask" : null
             },
             {
@@ -5295,12 +5368,12 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "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"],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_43",
           "next_tables" : {
             "FabricIngress.acl.set_next_id_acl" : "node_43",
             "FabricIngress.acl.punt_to_cpu" : "node_43",
-            "FabricIngress.acl.clone_to_cpu" : "node_43",
+            "FabricIngress.acl.set_clone_session_id" : "node_43",
             "FabricIngress.acl.drop" : "node_43",
             "FabricIngress.acl.nop_acl" : "node_43"
           },
@@ -5546,15 +5619,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto13"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport15"]
               }
             ]
           }
@@ -6051,9 +6124,9 @@
           "id" : 34,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
+            "line" : 44,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
           },
           "key" : [],
           "match_type" : "exact",
@@ -6064,9 +6137,9 @@
           "direct_meters" : null,
           "action_ids" : [58],
           "actions" : ["act_20"],
-          "base_default_next" : "tbl_act_21",
+          "base_default_next" : "node_58",
           "next_tables" : {
-            "act_20" : "tbl_act_21"
+            "act_20" : "node_58"
           },
           "default_entry" : {
             "action_id" : 58,
@@ -6079,10 +6152,10 @@
           "name" : "tbl_act_21",
           "id" : 35,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "filename" : "include/control/next.p4",
+            "line" : 308,
             "column" : 12,
-            "source_fragment" : "hdr.packet_in.setValid(); ..."
+            "source_fragment" : "mark_to_drop(standard_metadata)"
           },
           "key" : [],
           "match_type" : "exact",
@@ -6105,37 +6178,8 @@
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 36,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 308,
-            "column" : 12,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          },
-          "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_62",
-          "next_tables" : {
-            "act_22" : "node_62"
-          },
-          "default_entry" : {
-            "action_id" : 60,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 37,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -6164,7 +6208,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 38,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -6193,7 +6237,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 39,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 291,
@@ -6224,8 +6268,8 @@
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_23",
-            "__MISS__" : "tbl_act_24"
+            "__HIT__" : "tbl_act_22",
+            "__MISS__" : "tbl_act_23"
           },
           "default_entry" : {
             "action_id" : 51,
@@ -6235,6 +6279,29 @@
           }
         },
         {
+          "name" : "tbl_act_22",
+          "id" : 39,
+          "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_67",
+          "next_tables" : {
+            "act_22" : "node_67"
+          },
+          "default_entry" : {
+            "action_id" : 60,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_23",
           "id" : 40,
           "key" : [],
@@ -6246,9 +6313,9 @@
           "direct_meters" : null,
           "action_ids" : [61],
           "actions" : ["act_23"],
-          "base_default_next" : "node_69",
+          "base_default_next" : "node_67",
           "next_tables" : {
-            "act_23" : "node_69"
+            "act_23" : "node_67"
           },
           "default_entry" : {
             "action_id" : 61,
@@ -6258,31 +6325,8 @@
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 41,
-          "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_69",
-          "next_tables" : {
-            "act_24" : "node_69"
-          },
-          "default_entry" : {
-            "action_id" : 62,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 42,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -6298,9 +6342,9 @@
           "direct_meters" : null,
           "action_ids" : [55],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_72",
+          "base_default_next" : "node_70",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_72"
+            "FabricEgress.egress_next.push_vlan" : "node_70"
           },
           "default_entry" : {
             "action_id" : 55,
@@ -6310,8 +6354,8 @@
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 43,
+          "name" : "tbl_act_24",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 326,
@@ -6325,22 +6369,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_74",
+          "action_ids" : [63],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "act_26" : "node_74"
+            "act_25" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 44,
+          "name" : "tbl_act_25",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -6354,22 +6398,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_80",
+          "action_ids" : [62],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_78",
           "next_tables" : {
-            "act_25" : "node_80"
+            "act_24" : "node_78"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
-          "id" : 45,
+          "name" : "tbl_act_26",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 330,
@@ -6383,22 +6427,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [66],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_78",
+          "action_ids" : [65],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_76",
           "next_tables" : {
-            "act_28" : "node_78"
+            "act_27" : "node_76"
           },
           "default_entry" : {
-            "action_id" : 66,
+            "action_id" : 65,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
-          "id" : 46,
+          "name" : "tbl_act_27",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -6412,14 +6456,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [65],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_80",
+          "action_ids" : [64],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_78",
           "next_tables" : {
-            "act_27" : "node_80"
+            "act_26" : "node_78"
           },
           "default_entry" : {
-            "action_id" : 65,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6427,7 +6471,7 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 47,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 228,
@@ -6513,72 +6557,12 @@
               }
             }
           },
-          "true_next" : "node_57",
-          "false_next" : "node_60"
-        },
-        {
-          "name" : "node_57",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 44,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.is_multicast == true && ..."
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          },
           "true_next" : "tbl_act_20",
-          "false_next" : "tbl_act_21"
+          "false_next" : "node_58"
         },
         {
-          "name" : "node_60",
-          "id" : 20,
+          "name" : "node_58",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 306,
@@ -6626,12 +6610,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_22",
-          "false_next" : "node_62"
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_62",
-          "id" : 21,
+          "name" : "node_60",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 311,
@@ -6652,12 +6636,12 @@
               }
             }
           },
-          "true_next" : "node_63",
+          "true_next" : "node_61",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_63",
-          "id" : 22,
+          "name" : "node_61",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -6679,8 +6663,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_69",
-          "id" : 23,
+          "name" : "node_67",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -6705,12 +6689,12 @@
               }
             }
           },
-          "true_next" : "node_70",
-          "false_next" : "node_72"
+          "true_next" : "node_68",
+          "false_next" : "node_70"
         },
         {
-          "name" : "node_70",
-          "id" : 24,
+          "name" : "node_68",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -6732,11 +6716,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_72"
+          "false_next" : "node_70"
         },
         {
-          "name" : "node_72",
-          "id" : 25,
+          "name" : "node_70",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 325,
@@ -6754,12 +6738,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_76"
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_74"
         },
         {
-          "name" : "node_74",
-          "id" : 26,
+          "name" : "node_72",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -6780,12 +6764,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_80"
+          "true_next" : "tbl_act_25",
+          "false_next" : "node_78"
         },
         {
-          "name" : "node_76",
-          "id" : 27,
+          "name" : "node_74",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 329,
@@ -6803,12 +6787,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_80"
+          "true_next" : "tbl_act_26",
+          "false_next" : "node_78"
         },
         {
-          "name" : "node_78",
-          "id" : 28,
+          "name" : "node_76",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -6829,12 +6813,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
-          "false_next" : "node_80"
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_78"
         },
         {
-          "name" : "node_80",
-          "id" : 29,
+          "name" : "node_78",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 227,
@@ -6847,7 +6831,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction16"]
               },
               "right" : {
                 "type" : "hexstr",
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 b58cf61..b5fd3c7 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
@@ -277,7 +277,7 @@
     id: 16829684
   }
   action_refs {
-    id: 16790975
+    id: 16781601
   }
   action_refs {
     id: 16820765
@@ -562,9 +562,14 @@
 }
 actions {
   preamble {
-    id: 16790975
-    name: "FabricIngress.acl.clone_to_cpu"
-    alias: "clone_to_cpu"
+    id: 16781601
+    name: "FabricIngress.acl.set_clone_session_id"
+    alias: "set_clone_session_id"
+  }
+  params {
+    id: 1
+    name: "clone_id"
+    bitwidth: 32
   }
 }
 actions {
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 1e4d514..74580ff 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
@@ -21,11 +21,9 @@
         ["fabric_metadata_t.next_id", 32, 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_sport", 16, false],
-        ["fabric_metadata_t.l4_dport", 16, false],
-        ["_padding_0", 7, false]
+        ["fabric_metadata_t.l4_dport", 16, false]
       ]
     },
     {
@@ -251,7 +249,108 @@
   "header_union_types" : [],
   "header_unions" : [],
   "header_union_stacks" : [],
-  "field_lists" : [],
+  "field_lists" : [
+    {
+      "id" : 1,
+      "name" : "fl",
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 77,
+        "column" : 40,
+        "source_fragment" : "standard_metadata"
+      },
+      "elements" : [
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "clone_spec"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "instance_type"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "drop"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_port"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "packet_length"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "enq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_timedelta"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "deq_qdepth"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "ingress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_global_timestamp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "lf_field_list"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "mcast_grp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "resubmit_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "egress_rid"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "recirculate_flag"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "checksum_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "parser_error"]
+        },
+        {
+          "type" : "field",
+          "value" : ["standard_metadata", "priority"]
+        }
+      ]
+    }
+  ],
   "errors" : [
     ["NoError", 1],
     ["PacketTooShort", 2],
@@ -1427,37 +1526,32 @@
       ]
     },
     {
-      "name" : "FabricIngress.acl.clone_to_cpu",
+      "name" : "FabricIngress.acl.set_clone_session_id",
       "id" : 17,
-      "runtime_data" : [],
+      "runtime_data" : [
+        {
+          "name" : "clone_id",
+          "bitwidth" : 32
+        }
+      ],
       "primitives" : [
         {
-          "op" : "assign",
+          "op" : "clone_ingress_pkt_to_egress",
           "parameters" : [
             {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+              "type" : "runtime_data",
+              "value" : 0
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x1"
             }
           ],
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.clone_to_cpu = true"
+            "source_fragment" : "clone3<standard_metadata_t>(CloneType.I2E, clone_id, standard_metadata)"
           }
         }
       ]
@@ -2530,28 +2624,6 @@
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "mark_to_drop",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "standard_metadata"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_6",
-      "id" : 39,
-      "runtime_data" : [],
-      "primitives" : [
-        {
           "op" : "add_header",
           "parameters" : [
             {
@@ -2561,7 +2633,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "line" : 44,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -2580,7 +2652,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 50,
+            "line" : 45,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -2590,7 +2662,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 47,
             "column" : 12,
             "source_fragment" : "exit"
           }
@@ -2598,8 +2670,8 @@
       ]
     },
     {
-      "name" : "act_7",
-      "id" : 40,
+      "name" : "act_6",
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2620,8 +2692,8 @@
       ]
     },
     {
-      "name" : "act_8",
-      "id" : 41,
+      "name" : "act_7",
+      "id" : 40,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2650,8 +2722,8 @@
       ]
     },
     {
-      "name" : "act_9",
-      "id" : 42,
+      "name" : "act_8",
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2680,8 +2752,8 @@
       ]
     },
     {
-      "name" : "act_10",
-      "id" : 43,
+      "name" : "act_9",
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2702,8 +2774,8 @@
       ]
     },
     {
-      "name" : "act_11",
-      "id" : 44,
+      "name" : "act_10",
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2751,8 +2823,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 45,
+      "name" : "act_11",
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2773,8 +2845,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 46,
+      "name" : "act_12",
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3227,12 +3299,12 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "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"],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
           "base_default_next" : "node_18",
           "next_tables" : {
             "FabricIngress.acl.set_next_id_acl" : "node_18",
             "FabricIngress.acl.punt_to_cpu" : "node_18",
-            "FabricIngress.acl.clone_to_cpu" : "node_18",
+            "FabricIngress.acl.set_clone_session_id" : "node_18",
             "FabricIngress.acl.drop" : "node_18",
             "FabricIngress.acl.nop_acl" : "node_18"
           },
@@ -3812,9 +3884,9 @@
           "id" : 16,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 47,
-            "column" : 16,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
+            "line" : 44,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
           },
           "key" : [],
           "match_type" : "exact",
@@ -3825,9 +3897,9 @@
           "direct_meters" : null,
           "action_ids" : [38],
           "actions" : ["act_5"],
-          "base_default_next" : "tbl_act_6",
+          "base_default_next" : "node_33",
           "next_tables" : {
-            "act_5" : "tbl_act_6"
+            "act_5" : "node_33"
           },
           "default_entry" : {
             "action_id" : 38,
@@ -3840,10 +3912,10 @@
           "name" : "tbl_act_6",
           "id" : 17,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 49,
+            "filename" : "include/control/next.p4",
+            "line" : 308,
             "column" : 12,
-            "source_fragment" : "hdr.packet_in.setValid(); ..."
+            "source_fragment" : "mark_to_drop(standard_metadata)"
           },
           "key" : [],
           "match_type" : "exact",
@@ -3866,37 +3938,8 @@
           }
         },
         {
-          "name" : "tbl_act_7",
-          "id" : 18,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 308,
-            "column" : 12,
-            "source_fragment" : "mark_to_drop(standard_metadata)"
-          },
-          "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_37",
-          "next_tables" : {
-            "act_7" : "node_37"
-          },
-          "default_entry" : {
-            "action_id" : 40,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 19,
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -3925,7 +3968,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 20,
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -3954,7 +3997,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 21,
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 291,
@@ -3985,8 +4028,8 @@
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_8",
-            "__MISS__" : "tbl_act_9"
+            "__HIT__" : "tbl_act_7",
+            "__MISS__" : "tbl_act_8"
           },
           "default_entry" : {
             "action_id" : 32,
@@ -3996,6 +4039,29 @@
           }
         },
         {
+          "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_42",
+          "next_tables" : {
+            "act_7" : "node_42"
+          },
+          "default_entry" : {
+            "action_id" : 40,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_8",
           "id" : 22,
           "key" : [],
@@ -4007,9 +4073,9 @@
           "direct_meters" : null,
           "action_ids" : [41],
           "actions" : ["act_8"],
-          "base_default_next" : "node_44",
+          "base_default_next" : "node_42",
           "next_tables" : {
-            "act_8" : "node_44"
+            "act_8" : "node_42"
           },
           "default_entry" : {
             "action_id" : 41,
@@ -4019,31 +4085,8 @@
           }
         },
         {
-          "name" : "tbl_act_9",
-          "id" : 23,
-          "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_44",
-          "next_tables" : {
-            "act_9" : "node_44"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 24,
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -4059,9 +4102,9 @@
           "direct_meters" : null,
           "action_ids" : [35],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_47",
+          "base_default_next" : "node_45",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_47"
+            "FabricEgress.egress_next.push_vlan" : "node_45"
           },
           "default_entry" : {
             "action_id" : 35,
@@ -4071,8 +4114,8 @@
           }
         },
         {
-          "name" : "tbl_act_10",
-          "id" : 25,
+          "name" : "tbl_act_9",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 326,
@@ -4086,22 +4129,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_49",
+          "action_ids" : [43],
+          "actions" : ["act_10"],
+          "base_default_next" : "node_47",
           "next_tables" : {
-            "act_11" : "node_49"
+            "act_10" : "node_47"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 26,
+          "name" : "tbl_act_10",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -4115,22 +4158,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_10"],
+          "action_ids" : [42],
+          "actions" : ["act_9"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_10" : null
+            "act_9" : null
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 27,
+          "name" : "tbl_act_11",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 330,
@@ -4144,22 +4187,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_53",
+          "action_ids" : [45],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_51",
           "next_tables" : {
-            "act_13" : "node_53"
+            "act_12" : "node_51"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_13",
-          "id" : 28,
+          "name" : "tbl_act_12",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -4173,14 +4216,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_12"],
+          "action_ids" : [44],
+          "actions" : ["act_11"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_12" : null
+            "act_11" : null
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4245,72 +4288,12 @@
               }
             }
           },
-          "true_next" : "node_32",
-          "false_next" : "node_35"
-        },
-        {
-          "name" : "node_32",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 44,
-            "column" : 16,
-            "source_fragment" : "fabric_metadata.is_multicast == true && ..."
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          },
           "true_next" : "tbl_act_5",
-          "false_next" : "tbl_act_6"
+          "false_next" : "node_33"
         },
         {
-          "name" : "node_35",
-          "id" : 13,
+          "name" : "node_33",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 306,
@@ -4358,12 +4341,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_7",
-          "false_next" : "node_37"
+          "true_next" : "tbl_act_6",
+          "false_next" : "node_35"
         },
         {
-          "name" : "node_37",
-          "id" : 14,
+          "name" : "node_35",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 311,
@@ -4384,12 +4367,12 @@
               }
             }
           },
-          "true_next" : "node_38",
+          "true_next" : "node_36",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_38",
-          "id" : 15,
+          "name" : "node_36",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -4411,8 +4394,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_44",
-          "id" : 16,
+          "name" : "node_42",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -4437,12 +4420,12 @@
               }
             }
           },
-          "true_next" : "node_45",
-          "false_next" : "node_47"
+          "true_next" : "node_43",
+          "false_next" : "node_45"
         },
         {
-          "name" : "node_45",
-          "id" : 17,
+          "name" : "node_43",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -4464,11 +4447,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_47"
+          "false_next" : "node_45"
         },
         {
-          "name" : "node_47",
-          "id" : 18,
+          "name" : "node_45",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 325,
@@ -4486,12 +4469,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_10",
-          "false_next" : "node_51"
+          "true_next" : "tbl_act_9",
+          "false_next" : "node_49"
         },
         {
-          "name" : "node_49",
-          "id" : 19,
+          "name" : "node_47",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -4513,11 +4496,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_11"
+          "true_next" : "tbl_act_10"
         },
         {
-          "name" : "node_51",
-          "id" : 20,
+          "name" : "node_49",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 329,
@@ -4536,11 +4519,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_12"
+          "true_next" : "tbl_act_11"
         },
         {
-          "name" : "node_53",
-          "id" : 21,
+          "name" : "node_51",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -4562,7 +4545,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_13"
+          "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 c74940c..fdff523 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
@@ -235,7 +235,7 @@
     id: 16829684
   }
   action_refs {
-    id: 16790975
+    id: 16781601
   }
   action_refs {
     id: 16820765
@@ -498,9 +498,14 @@
 }
 actions {
   preamble {
-    id: 16790975
-    name: "FabricIngress.acl.clone_to_cpu"
-    alias: "clone_to_cpu"
+    id: 16781601
+    name: "FabricIngress.acl.set_clone_session_id"
+    alias: "set_clone_session_id"
+  }
+  params {
+    id: 1
+    name: "clone_id"
+    bitwidth: 32
   }
 }
 actions {
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 217a736..e59086b 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
@@ -89,23 +89,6 @@
     /* Forwarding control block */
 
     /**
-     * Map treatment to duplicate_to_controller action.
-     */
-    @Test
-    public void testAclTreatmentCloneToCpu() throws Exception {
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .punt()
-                .build();
-        PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_ACL_ACL);
-        PiAction expectedAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_ACL_CLONE_TO_CPU)
-                .build();
-
-        assertEquals(expectedAction, mappedAction);
-    }
-
-    /**
      * Map empty treatment for routing v4 table.
      */
     @Test
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 9c04d8f..1294b5e 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 com.google.common.collect.ImmutableList;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -24,6 +25,7 @@
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.TpPort;
 import org.onlab.packet.UDP;
+import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.DefaultFlowRule;
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -34,7 +36,13 @@
 import org.onosproject.net.flow.criteria.EthCriterion;
 import org.onosproject.net.flowobjective.DefaultForwardingObjective;
 import org.onosproject.net.flowobjective.ForwardingObjective;
+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.PiActionParam;
@@ -84,11 +92,14 @@
         List<FlowRule> flowRulesInstalled = (List<FlowRule>) result.flowRules();
         List<GroupDescription> groupsInstalled = (List<GroupDescription>) result.groups();
         assertEquals(1, flowRulesInstalled.size());
-        assertTrue(groupsInstalled.isEmpty());
+        assertEquals(1, groupsInstalled.size());
 
         FlowRule actualFlowRule = flowRulesInstalled.get(0);
         PiAction piAction = PiAction.builder()
-                .withId(FabricConstants.FABRIC_INGRESS_ACL_CLONE_TO_CPU)
+                .withId(FabricConstants.FABRIC_INGRESS_ACL_SET_CLONE_SESSION_ID)
+                .withParameter(new PiActionParam(
+                        FabricConstants.CLONE_ID,
+                        ForwardingObjectiveTranslator.CLONE_TO_CPU_ID))
                 .build();
         FlowRule expectedFlowRule = DefaultFlowRule.builder()
                 .forDevice(DEVICE_ID)
@@ -101,7 +112,28 @@
                 .fromApp(APP_ID)
                 .build();
 
+        GroupDescription actualCloneGroup = groupsInstalled.get(0);
+        TrafficTreatment cloneGroupTreatment = DefaultTrafficTreatment.builder()
+                .setOutput(PortNumber.CONTROLLER)
+                .build();
+
+        List<GroupBucket> cloneBuckets = ImmutableList.of(
+                DefaultGroupBucket.createCloneGroupBucket(cloneGroupTreatment));
+
+        GroupBuckets cloneGroupBuckets = new GroupBuckets(cloneBuckets);
+        GroupKey cloneGroupKey = new DefaultGroupKey(
+                FabricPipeliner.KRYO.serialize(ForwardingObjectiveTranslator.CLONE_TO_CPU_ID));
+        GroupDescription expectedCloneGroup = new DefaultGroupDescription(
+                DEVICE_ID,
+                GroupDescription.Type.CLONE,
+                cloneGroupBuckets,
+                cloneGroupKey,
+                ForwardingObjectiveTranslator.CLONE_TO_CPU_ID,
+                APP_ID
+        );
+
         assertTrue(expectedFlowRule.exactMatch(actualFlowRule));
+        assertTrue(expectedCloneGroup.equals(actualCloneGroup));
     }
 
     /**
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 b28074d..cf7d741 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
@@ -392,9 +392,6 @@
         List<GroupBucket> allBuckets = allTreatments.stream()
                 .map(DefaultGroupBucket::createAllGroupBucket)
                 .collect(Collectors.toList());
-        // FIXME: remove when we implement proper clone to CPU behavior
-        allBuckets.add(DefaultGroupBucket.createAllGroupBucket(
-                DefaultTrafficTreatment.builder().punt().build()));
         GroupBuckets allGroupBuckets = new GroupBuckets(allBuckets);
         GroupKey allGroupKey = new DefaultGroupKey(FabricPipeliner.KRYO.serialize(NEXT_ID_1));
         GroupDescription expectedAllGroup = new DefaultGroupDescription(